@@ -162,28 +162,28 @@ jobs:
162162 compression-level : 0
163163 retention-days : 1
164164
165- build-32 -bit-addon :
166- name : build-32 -bit-addon
165+ build-64 -bit-addon :
166+ name : build-64 -bit-addon
167167 continue-on-error : false
168- needs : [l10n, zip-rules, rust-32 ]
168+ needs : [l10n, zip-rules, rust-64 ]
169169 runs-on : ubuntu-latest
170170 steps :
171171 - name : Checkout code
172172 uses : actions/checkout@v3
173- # download the 32 build
174- - name : Download 32 bit build
173+ # download the 64 build
174+ - name : Download 64 bit build
175175 uses : actions/download-artifact@v4
176176 with :
177- name : libmathcat_py-32 -3.11 -win.zip
177+ name : libmathcat_py-64 -3.13 -win.zip
178178 # download the Rules dir (not part of checkout)
179- - name : Download 32 bit build
179+ - name : Download 64 bit build
180180 uses : actions/download-artifact@v4
181181 with :
182182 name : Rules.zip
183183 # put things where they belong
184184 - name : Set up addons dir
185185 run : |
186- unzip libmathcat_py-32 -3.11 -win.zip
186+ unzip libmathcat_py-64 -3.13 -win.zip
187187 mv libmathcat_py.pyd Rules.zip addon/globalPlugins/MathCAT
188188 cd addon/globalPlugins/MathCAT
189189 sed 's/^import wx\.xrc/# import wx.xrc/' --in-place MathCATgui.py # fix wx file
@@ -193,19 +193,24 @@ jobs:
193193 - name : Set up Python
194194 uses : actions/setup-python@v4
195195 with :
196- python-version : 3.11 # needed for scons
196+ python-version : 3.13 # needed for scons
197197 - name : Install scons dependencies
198198 run : |
199199 pip install scons markdown
200200 sudo apt update
201201 sudo apt install gettext
202+ - name : Update NVDA Version Constraints
203+ run : |
204+ # Adjust the version numbers for the old 32 bit NVDA version
205+ sed -i 's/"addon_minimumNVDAVersion": "[^"]*"/"addon_minimumNVDAVersion": "2025.1"/' buildVars.py
206+ sed -i 's/"addon_lastTestedNVDAVersion": "[^"]*"/"addon_lastTestedNVDAVersion": "2025.4"/' buildVars.py
202207 - name : Run scons to build .addon file
203208 run : |
204209 scons
205- - name : Rename addon for 32 -bit
210+ - name : Rename addon for 64 -bit
206211 run : |
207212 for f in *.nvda-addon; do
208- mv "$f" "${f%.nvda-addon}-32 .nvda-addon"
213+ mv "$f" "${f%.nvda-addon}-64 .nvda-addon"
209214 done
210215 - name : Upload the addon
211216 uses : actions/upload-artifact@v4
@@ -215,29 +220,28 @@ jobs:
215220 compression-level : 0
216221 retention-days : 1
217222
218-
219- build-64-bit-addon :
220- name : build-64-bit-addon
223+ build-32-bit-addon :
224+ name : build-32-bit-addon
221225 continue-on-error : false
222- needs : [l10n, zip-rules, rust-64 ]
226+ needs : [l10n, zip-rules, rust-32 ]
223227 runs-on : ubuntu-latest
224228 steps :
225229 - name : Checkout code
226230 uses : actions/checkout@v3
227- # download the 64 build
228- - name : Download 64 bit build
231+ # download the 32 build
232+ - name : Download 32 bit build
229233 uses : actions/download-artifact@v4
230234 with :
231- name : libmathcat_py-64 -3.13 -win.zip
235+ name : libmathcat_py-32 -3.11 -win.zip
232236 # download the Rules dir (not part of checkout)
233- - name : Download 64 bit build
237+ - name : Download 32 bit build
234238 uses : actions/download-artifact@v4
235239 with :
236240 name : Rules.zip
237241 # put things where they belong
238242 - name : Set up addons dir
239243 run : |
240- unzip libmathcat_py-64 -3.13 -win.zip
244+ unzip libmathcat_py-32 -3.11 -win.zip
241245 mv libmathcat_py.pyd Rules.zip addon/globalPlugins/MathCAT
242246 cd addon/globalPlugins/MathCAT
243247 sed 's/^import wx\.xrc/# import wx.xrc/' --in-place MathCATgui.py # fix wx file
@@ -247,7 +251,7 @@ jobs:
247251 - name : Set up Python
248252 uses : actions/setup-python@v4
249253 with :
250- python-version : 3.13 # needed for scons
254+ python-version : 3.11 # needed for scons
251255 - name : Install scons dependencies
252256 run : |
253257 pip install scons markdown
@@ -256,6 +260,11 @@ jobs:
256260 - name : Run scons to build .addon file
257261 run : |
258262 scons
263+ - name : Rename addon for 32-bit
264+ run : |
265+ for f in *.nvda-addon; do
266+ mv "$f" "${f%.nvda-addon}-32.nvda-addon"
267+ done
259268 - name : Upload the addon
260269 uses : actions/upload-artifact@v4
261270 with :
0 commit comments