Skip to content

Commit a830c61

Browse files
committed
running 32 and 64 bit builds sequentially since they use the same test directory and copying files resulted in conflicts
1 parent dce9d2a commit a830c61

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

.github/workflows/automaticRelease.yaml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ jobs:
5050
compression-level: 0
5151
retention-days: 1
5252

53-
rust-32:
54-
name: Build 32 bit windows pyd file
53+
rust-32-and-64:
54+
# running both 32 and 64 bit builds sequentially because they both use the same "Example" dir
55+
# for testing and that can result in conflicts
56+
name: Build 32 and 64 bit windows pyd file
5557
runs-on: windows-latest # needs to run on windows because of bzip2
5658
steps:
5759
- name: Checkout code
@@ -67,7 +69,7 @@ jobs:
6769
- name: Setup Example dir
6870
run: |
6971
cp target/i686-pc-windows-msvc/release/libmathcat_py.dll Example/libmathcat_py.pyd
70-
Move-item -Force addon/globalPlugins/MathCAT/Rules Example
72+
mv addon/globalPlugins/MathCAT/Rules Example
7173
- name: test the build
7274
run: |
7375
cd Example
@@ -87,12 +89,6 @@ jobs:
8789
compression-level: 0
8890
retention-days: 1
8991

90-
rust-64:
91-
name: Build 64 bit windows pyd file
92-
runs-on: windows-latest # needs to run on windows because of bzip2
93-
steps:
94-
- name: Checkout code
95-
uses: actions/checkout@v3
9692
- name: Set up Python
9793
uses: actions/setup-python@v5
9894
with:
@@ -104,7 +100,7 @@ jobs:
104100
- name: Setup Example dir
105101
run: |
106102
cp target/x86_64-pc-windows-msvc/release/libmathcat_py.dll Example/libmathcat_py.pyd
107-
Move-item -Force addon/globalPlugins/MathCAT/Rules Example
103+
# no need to move the Rules dir again -- it is already there
108104
- name: create zip file for pyd file -- this allows the name to indicate arch, python version, etc., but unzipped it is correctly named
109105
uses: thedoctor0/zip-release@0.7.5
110106
with:
@@ -184,7 +180,7 @@ jobs:
184180
- name: Set up addons dir
185181
run: |
186182
unzip libmathcat_py-32-3.11-win.zip
187-
mv -f libmathcat_py.pyd Rules.zip addon/globalPlugins/MathCAT
183+
mv libmathcat_py.pyd Rules.zip addon/globalPlugins/MathCAT
188184
cd addon/globalPlugins/MathCAT
189185
sed 's/^import wx\.xrc/# import wx.xrc/' --in-place MathCATgui.py # fix wx file
190186
unzip Rules.zip

0 commit comments

Comments
 (0)