Skip to content

Commit 43819c2

Browse files
committed
Hopefully figured out the build problem -- I accidentally added some files to the Example test dir.
Reverting automaticRelease.yaml to what it was before I added the files.
1 parent efe9db7 commit 43819c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+13
-15088
lines changed

.github/workflows/automaticRelease.yaml

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

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
53+
rust-32:
54+
name: Build 32 bit windows pyd file
5755
runs-on: windows-latest # needs to run on windows because of bzip2
5856
steps:
5957
- name: Checkout code
@@ -69,8 +67,6 @@ jobs:
6967
- name: Setup Example dir
7068
run: |
7169
cp target/i686-pc-windows-msvc/release/libmathcat_py.dll Example/libmathcat_py.pyd
72-
# Example/Rules should not exist, but I was getting errors from "mv" saying it did
73-
rm Example/Rules -Recurse -Force -ErrorAction SilentlyContinue
7470
mv addon/globalPlugins/MathCAT/Rules Example
7571
- name: test the build
7672
run: |
@@ -91,6 +87,12 @@ jobs:
9187
compression-level: 0
9288
retention-days: 1
9389

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
9496
- name: Set up Python
9597
uses: actions/setup-python@v5
9698
with:
@@ -102,7 +104,7 @@ jobs:
102104
- name: Setup Example dir
103105
run: |
104106
cp target/x86_64-pc-windows-msvc/release/libmathcat_py.dll Example/libmathcat_py.pyd
105-
# no need to move the Rules dir again -- it is already there
107+
mv addon/globalPlugins/MathCAT/Rules Example
106108
- name: create zip file for pyd file -- this allows the name to indicate arch, python version, etc., but unzipped it is correctly named
107109
uses: thedoctor0/zip-release@0.7.5
108110
with:
@@ -138,9 +140,9 @@ jobs:
138140
cargo build --target x86_64-unknown-linux-gnu --release
139141
- name: Setup Example dir
140142
run: |
141-
# don't know why it is "liblib...". For consistency with other versions, it is renamed.
143+
# don't know why it is "liblib...". For consistancy with other versions, it is renamed.
142144
cp target/x86_64-unknown-linux-gnu/release/liblibmathcat_py.so Example/libmathcat_py.so
143-
mv addon/globalPlugins/MathCAT/Rules Example
145+
cp -r addon/globalPlugins/MathCAT/Rules Example
144146
- name: test build
145147
run: |
146148
cd Example
@@ -163,7 +165,7 @@ jobs:
163165
build-addon:
164166
name: build-addon
165167
continue-on-error: false
166-
needs: [l10n, zip-rules, rust-32-and-64]
168+
needs: [l10n, zip-rules, rust-32]
167169
runs-on: ubuntu-latest
168170
steps:
169171
- name: Checkout code
@@ -211,7 +213,7 @@ jobs:
211213
pre-release:
212214
name: Pre Release
213215
continue-on-error: false
214-
needs: [zip-rules, rust-32-and-64, linux-64, build-addon]
216+
needs: [zip-rules, rust-32, rust-64, linux-64, build-addon]
215217
runs-on: ubuntu-latest
216218
steps:
217219
- name: Checkout code

Example/Rules.zip

-918 KB
Binary file not shown.
-8.35 KB
Binary file not shown.
-8.17 KB
Binary file not shown.

Example/Rules/Braille/CMU/CMU.zip

-23.5 KB
Binary file not shown.
-31.9 KB
Binary file not shown.
-30.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)