Skip to content

Commit 56ab8b9

Browse files
lmbelolmbelo
committed
Workflow updates
1 parent a477772 commit 56ab8b9

File tree

2 files changed

+60
-42
lines changed

2 files changed

+60
-42
lines changed

‎.github/workflows/pypi.yml

Lines changed: 58 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Check out repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Build and Install FMX
2525
run: |
@@ -38,10 +38,10 @@ jobs:
3838
3939
- name: Cache Stubs
4040
id: cache-stubs
41-
uses: actions/cache@v3
41+
uses: actions/cache@v4
4242
with:
4343
path: .\delphifmx\__init__.pyi
44-
key: ${{ runner.os }}-stubs
44+
key: ${{ runner.os }}-cache-${{ hashFiles('.\delphifmx\*') }}
4545

4646
build_stubs_linux:
4747
name: Build FMX Stubs for Linux
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Check out repository
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959

6060
- name: Set up Python ${{ matrix.python }}
6161
uses: actions/setup-python@v3
@@ -79,10 +79,10 @@ jobs:
7979
8080
- name: Cache Stubs
8181
id: cache-stubs
82-
uses: actions/cache@v3
82+
uses: actions/cache@v4
8383
with:
8484
path: ./delphifmx/__init__.pyi
85-
key: ${{ runner.os }}-stubs
85+
key: ${{ runner.os }}-cache-${{ hashFiles('./delphifmx/*') }}
8686

8787
build_stubs_macos:
8888
name: Build FMX Stubs MacOS
@@ -96,7 +96,7 @@ jobs:
9696

9797
steps:
9898
- name: Check out repository
99-
uses: actions/checkout@v3
99+
uses: actions/checkout@v4
100100

101101
- name: Set up Python ${{ matrix.python }}
102102
uses: actions/setup-python@v3
@@ -120,10 +120,10 @@ jobs:
120120
121121
- name: Cache Stubs
122122
id: cache-stubs
123-
uses: actions/cache@v3
123+
uses: actions/cache@v4
124124
with:
125125
path: ./delphifmx/__init__.pyi
126-
key: Macos-stubs
126+
key: MacOS-cache-${{ hashFiles('./delphifmx/*') }}
127127
enableCrossOsArchive: true
128128

129129
#This build makes delphifmx available for Android
@@ -138,7 +138,7 @@ jobs:
138138
arch: "x86_64"
139139
steps:
140140
- name: Check out repository
141-
uses: actions/checkout@v3
141+
uses: actions/checkout@v4
142142
with:
143143
fetch-depth: 0
144144

@@ -154,8 +154,9 @@ jobs:
154154
python setup.py bdist_wheel --universal
155155
156156
- name: Save sdist
157-
uses: actions/upload-artifact@v2
157+
uses: actions/upload-artifact@v4
158158
with:
159+
name: artifacts-universal-${{ matrix.python }}
159160
path: dist/*.whl
160161
if-no-files-found: error
161162

@@ -165,22 +166,24 @@ jobs:
165166
runs-on: ${{ matrix.os }}
166167
strategy:
167168
matrix:
168-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
169+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
169170
include:
170171
- os: [windows-latest]
171172
arch: ["x86"]
172173
steps:
173174
- name: Check out repository
174-
uses: actions/checkout@v3
175+
uses: actions/checkout@v4
175176
with:
176177
fetch-depth: 0
177178

178179
- name: Restore Cached Stubs
179180
id: cache-stubs
180-
uses: actions/cache@v3
181+
uses: actions/cache@v4
181182
with:
182183
path: .\delphifmx\__init__.pyi
183-
key: ${{ runner.os }}-stubs
184+
key: ${{ runner.os }}-cache-${{ hashFiles('.\delphifmx\*') }}
185+
restore-keys: |
186+
${{ runner.os }}-cache-
184187
185188
- name: Set up Python ${{ matrix.python }}
186189
uses: actions/setup-python@v3
@@ -189,14 +192,15 @@ jobs:
189192
architecture: "x86"
190193

191194
- name: Build bdist wheel
192-
run: |
195+
run: |
193196
python -m pip install setuptools --upgrade
194197
python -m pip install wheel --upgrade
195198
python setup.py bdist_wheel --plat-name=win32
196199
197200
- name: Save wheel
198-
uses: actions/upload-artifact@v2
201+
uses: actions/upload-artifact@v4
199202
with:
203+
name: artifacts-win32-${{ matrix.python }}
200204
path: dist/*.whl
201205
if-no-files-found: error
202206

@@ -206,22 +210,24 @@ jobs:
206210
runs-on: ${{ matrix.os }}
207211
strategy:
208212
matrix:
209-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
213+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
210214
include:
211215
- os: [windows-latest]
212216
arch: ["AMD64"]
213217
steps:
214218
- name: Check out repository
215-
uses: actions/checkout@v3
219+
uses: actions/checkout@v4
216220
with:
217221
fetch-depth: 0
218222

219223
- name: Restore Cached Stubs
220224
id: cache-stubs
221-
uses: actions/cache@v3
225+
uses: actions/cache@v4
222226
with:
223227
path: .\delphifmx\__init__.pyi
224-
key: ${{ runner.os }}-stubs
228+
key: ${{ runner.os }}-cache-${{ hashFiles('.\delphifmx\*') }}
229+
restore-keys: |
230+
${{ runner.os }}-cache-
225231
226232
- name: Set up Python ${{ matrix.python }}
227233
uses: actions/setup-python@v3
@@ -236,8 +242,9 @@ jobs:
236242
python setup.py bdist_wheel --plat-name=win_amd64
237243
238244
- name: Save wheel
239-
uses: actions/upload-artifact@v2
245+
uses: actions/upload-artifact@v4
240246
with:
247+
name: artifacts-win64-${{ matrix.python }}
241248
path: dist/*.whl
242249
if-no-files-found: error
243250

@@ -247,22 +254,24 @@ jobs:
247254
runs-on: ${{ matrix.os }}
248255
strategy:
249256
matrix:
250-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
257+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
251258
include:
252259
- os: [ubuntu-20.04] #ubuntu-latest doesn't support cp36
253260
arch: ["x86_64"]
254261
steps:
255262
- name: Check out repository
256-
uses: actions/checkout@v3
263+
uses: actions/checkout@v4
257264
with:
258265
fetch-depth: 0
259266

260267
- name: Restore Cached Stubs
261268
id: cache-stubs
262-
uses: actions/cache@v3
269+
uses: actions/cache@v4
263270
with:
264271
path: ./delphifmx/__init__.pyi
265-
key: ${{ runner.os }}-stubs
272+
key: ${{ runner.os }}-cache-${{ hashFiles('./delphifmx/*') }}
273+
restore-keys: |
274+
${{ runner.os }}-cache-
266275
267276
- name: Set up Python ${{ matrix.python }}
268277
uses: actions/setup-python@v3
@@ -276,8 +285,9 @@ jobs:
276285
python setup.py bdist_wheel --plat-name=manylinux1_x86_64
277286
278287
- name: Save wheel
279-
uses: actions/upload-artifact@v2
288+
uses: actions/upload-artifact@v4
280289
with:
290+
name: artifacts-linux-${{ matrix.python }}
281291
path: dist/*.whl
282292
if-no-files-found: error
283293

@@ -287,22 +297,24 @@ jobs:
287297
runs-on: ${{ matrix.os }}
288298
strategy:
289299
matrix:
290-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
300+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
291301
include:
292-
- os: [macos-latest]
302+
- os: [macos-13] #macos-latest is arm only
293303
arch: ["x86_64"]
294304
steps:
295305
- name: Check out repository
296-
uses: actions/checkout@v3
306+
uses: actions/checkout@v4
297307
with:
298308
fetch-depth: 0
299309

300310
- name: Restore Cached Stubs
301311
id: cache-stubs
302-
uses: actions/cache@v3
312+
uses: actions/cache@v4
303313
with:
304314
path: ./delphifmx/__init__.pyi
305-
key: Macos-stubs
315+
key: MacOS-cache-${{ hashFiles('./delphifmx/*') }}
316+
restore-keys: |
317+
MacOS-cache-
306318
enableCrossOsArchive: true
307319

308320
- name: Set up Python ${{ matrix.python }}
@@ -317,8 +329,9 @@ jobs:
317329
python setup.py bdist_wheel --plat-name=macosx_10_9_x86_64
318330
319331
- name: Save wheel
320-
uses: actions/upload-artifact@v2
332+
uses: actions/upload-artifact@v4
321333
with:
334+
name: artifacts-macintel-${{ matrix.python }}
322335
path: dist/*.whl
323336
if-no-files-found: error
324337

@@ -328,22 +341,24 @@ jobs:
328341
runs-on: ${{ matrix.os }}
329342
strategy:
330343
matrix:
331-
python: ['3.8', '3.9', '3.10', '3.11']
344+
python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
332345
include:
333346
- os: [macos-latest]
334347
arch: ["arm64"]
335348
steps:
336349
- name: Check out repository
337-
uses: actions/checkout@v3
350+
uses: actions/checkout@v4
338351
with:
339352
fetch-depth: 0
340353

341354
- name: Restore Cached Stubs
342355
id: cache-stubs
343-
uses: actions/cache@v3
356+
uses: actions/cache@v4
344357
with:
345358
path: ./delphifmx/__init__.pyi
346-
key: Macos-stubs
359+
key: MacOS-cache-${{ hashFiles('./delphifmx/*') }}
360+
restore-keys: |
361+
MacOS-cache-
347362
enableCrossOsArchive: true
348363

349364
- name: Set up Python ${{ matrix.python }}
@@ -358,8 +373,9 @@ jobs:
358373
python setup.py bdist_wheel --plat-name=macosx_11_0_arm64
359374
360375
- name: Save wheel
361-
uses: actions/upload-artifact@v2
376+
uses: actions/upload-artifact@v4
362377
with:
378+
name: artifacts-marcarm-${{ matrix.python }}
363379
path: dist/*.whl
364380
if-no-files-found: error
365381

@@ -376,8 +392,9 @@ jobs:
376392
steps:
377393
- uses: actions/download-artifact@v2
378394
with:
379-
name: artifact
395+
pattern: artifacts-*
380396
path: dist
397+
merge-multiple: true
381398

382399
- name: Publish package to TestPyPI
383400
uses: pypa/gh-action-pypi-publish@release/v1
@@ -397,8 +414,9 @@ jobs:
397414
steps:
398415
- uses: actions/download-artifact@v2
399416
with:
400-
name: artifact
417+
pattern: artifacts-*
401418
path: dist
419+
merge-multiple: true
402420

403421
- name: Publish package to PyPI
404422
uses: pypa/gh-action-pypi-publish@release/v1

‎.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
config:
1818
- { os: windows-latest, arch: AMD64, python-arch: x64, name: windows-latest-x64 }
1919
- { os: windows-latest, arch: x86, python-arch: x86, name: windows-latest-x86 }
20-
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
20+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
2121
steps:
2222
- name: Check out repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Set up Python ${{ matrix.python }}
2626
uses: actions/setup-python@v3

0 commit comments

Comments
 (0)