Skip to content

Commit e2c0c61

Browse files
committed
re-order jobs -- probably need to move to using linux for all, but trying this...
1 parent 8f53413 commit e2c0c61

File tree

1 file changed

+22
-15
lines changed

1 file changed

+22
-15
lines changed

.github/workflows/automaticRelease.yaml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,29 @@ jobs:
2727
git pull
2828
git push
2929
30+
rust:
31+
name: build pyd file
32+
needs: l10n
33+
runs-on: windows-latest
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v3
37+
- name: Set up Python
38+
uses: actions/setup-python@v4
39+
with:
40+
python-version: 3.11
41+
architecture: 'x86'
42+
- name: Set up Rust
43+
run: cargo build --target i686-pc-windows-msvc --release
44+
- name: Copy MathCAT.pyd file and fix wx file
45+
run: |
46+
cp target/i686-pc-windows-msvc/release/libmathcat_py.dll addon/globalPlugins/MathCAT/libmathcat.pyd
47+
sed 's/^import wx\.xrc/# import wx.xrc/' --in-place "addon/globalPlugins/MathCAT/MathCATgui.py"
48+
3049
scons:
3150
name: Build with scons
3251
continue-on-error: false
52+
needs: rust
3353
runs-on: ubuntu-latest
3454
steps:
3555
- name: Checkout code
@@ -43,27 +63,14 @@ jobs:
4363
pip install scons markdown
4464
sudo apt update
4565
sudo apt install gettext
46-
- name: Build
66+
- name: Run scons
4767
run: scons
4868

4969
pre-release:
5070
name: Pre Release
51-
needs: [l10n, scons]
71+
needs: scons
5272
runs-on: windows-latest
5373
steps:
54-
- name: Checkout code
55-
uses: actions/checkout@v3
56-
- name: Set up Python
57-
uses: actions/setup-python@v4
58-
with:
59-
python-version: 3.11
60-
architecture: 'x86'
61-
- name: Set up Rust
62-
run: cargo build --target i686-pc-windows-msvc --release
63-
- name: Copy MathCAT.pyd file and fix wx file
64-
run: |
65-
cp target/i686-pc-windows-msvc/release/libmathcat_py.dll addon/globalPlugins/MathCAT/libmathcat.pyd
66-
sed 's/^import wx\.xrc/# import wx.xrc/' --in-place "addon/globalPlugins/MathCAT/MathCATgui.py"
6774
- name: Automatic release
6875
uses: marvinpinto/action-automatic-releases@latest
6976
with:

0 commit comments

Comments
 (0)