Skip to content

Commit 19b795c

Browse files
authored
Merge pull request #603 from Farama-Foundation/workflow-updates
Update/fix workflows
2 parents 430a395 + a282437 commit 19b795c

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

.github/workflows/build-and-test-wheels.yml

+19-16
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
- 'setup.py'
1313
- 'pyproject.toml'
1414
branches: [master]
15+
pull_request:
16+
paths:
17+
- '.github/workflows/build-and-test-wheels.yml'
1518
release:
1619
types: [published]
1720

@@ -21,7 +24,7 @@ jobs:
2124
runs-on: ${{ matrix.os }}
2225
strategy:
2326
matrix:
24-
os: [ubuntu-22.04, macos-12, macos-14]
27+
os: [ubuntu-24.04, macos-13, macos-14]
2528
fail-fast: false
2629

2730
steps:
@@ -42,19 +45,19 @@ jobs:
4245
platforms: all
4346

4447
- name: Build manylinux wheels
45-
if: matrix.os == 'ubuntu-22.04'
48+
if: matrix.os == 'ubuntu-24.04'
4649
uses: pypa/[email protected]
4750
env:
4851
# Configure cibuildwheel to build native archs, and some emulated ones
4952
CIBW_ARCHS_LINUX: x86_64 aarch64
5053
CIBW_BUILD_VERBOSITY: 1
5154

5255
- name: Build macOS Intel wheels
53-
if: matrix.os == 'macos-12'
56+
if: matrix.os == 'macos-13'
5457
uses: pypa/[email protected]
5558
env:
5659
CIBW_ARCHS_MACOS: x86_64
57-
CIBW_ENVIRONMENT_MACOS: VIZDOOM_MACOS_ARCH=x86_64 HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 MACOSX_DEPLOYMENT_TARGET=12.0
60+
CIBW_ENVIRONMENT_MACOS: VIZDOOM_MACOS_ARCH=x86_64 HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 MACOSX_DEPLOYMENT_TARGET=13.0
5861
CIBW_BUILD_VERBOSITY: 1
5962

6063
- name: Build macOS Apple Silicon wheels
@@ -70,8 +73,9 @@ jobs:
7073
ls -l ./wheelhouse/*.whl
7174
7275
- name: Upload artifacts
73-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7477
with:
78+
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}
7579
path: ./wheelhouse/*.whl
7680

7781
test_wheels:
@@ -80,8 +84,8 @@ jobs:
8084
runs-on: ${{ matrix.os }}
8185
strategy:
8286
matrix:
83-
os: [ubuntu-22.04, ubuntu-24.04, macos-12, macos-13, macos-14]
84-
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
87+
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
88+
python-version: ['3.9', '3.10', '3.11', '3.12']
8589
fail-fast: false
8690

8791
steps:
@@ -95,11 +99,10 @@ jobs:
9599
python-version: ${{ matrix.python-version }}
96100

97101
- name: Download all dists
98-
uses: actions/download-artifact@v3
102+
uses: actions/download-artifact@v4
99103
with:
100-
# Unpacks default artifact into dist/
101-
# If `name: artifact` is omitted, the action will create extra parent dir
102-
name: artifact
104+
pattern: artifact-*
105+
merge-multiple: true
103106
path: dist
104107

105108
- name: Report dist directory
@@ -153,8 +156,9 @@ jobs:
153156
run: pipx run build --sdist
154157

155158
- name: Upload sdist
156-
uses: actions/upload-artifact@v3
159+
uses: actions/upload-artifact@v4
157160
with:
161+
name: artifact-sdist
158162
path: dist/*.tar.gz
159163

160164
upload_pypi:
@@ -167,11 +171,10 @@ jobs:
167171
if: github.event_name == 'release' && github.event.action == 'published'
168172
steps:
169173
- name: Download all dists
170-
uses: actions/download-artifact@v3
174+
uses: actions/download-artifact@v4
171175
with:
172-
# Unpacks default artifact into dist/
173-
# If `name: artifact` is omitted, the action will create extra parent dir
174-
name: artifact
176+
pattern: artifact-*
177+
merge-multiple: true
175178
path: dist
176179

177180
- name: Publish to PyPI

.github/workflows/build-and-test-windows-wheels.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ jobs:
142142
python -m pytest tests
143143
144144
- name: Upload artifacts
145-
uses: actions/upload-artifact@v3
145+
uses: actions/upload-artifact@v4
146146
with:
147+
name: artifact-${{ matrix.os }}-${{ matrix.python-version }}
147148
path: ./dist/*.whl
148149

149150
upload_pypi:
@@ -156,11 +157,10 @@ jobs:
156157
if: github.event_name == 'release' && github.event.action == 'published'
157158
steps:
158159
- name: Download all dists
159-
uses: actions/download-artifact@v3
160+
uses: actions/download-artifact@v4
160161
with:
161-
# Unpacks default artifact into dist/
162-
# If `name: artifact` is omitted, the action will create extra parent dir
163-
name: artifact
162+
pattern: artifact-*
163+
merge-multiple: true
164164
path: dist
165165

166166
- name: Publish to PyPI

pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ reportAttributeAccessIssue = "warning"
3434

3535
[tool.cibuildwheel]
3636
# We need to build for the following Python versions:
37-
build = "cp{38,39,310,311,312}-*"
37+
build = "cp{39,310,311,312}-*"
3838

3939
[tool.cibuildwheel.linux]
4040
# Only manylinux is supported (no musl)
41-
build = "cp{38,39,310,311,312}-manylinux*"
41+
build = "cp{39,310,311,312}-manylinux*"
4242
repair-wheel-command = "auditwheel show {wheel} && auditwheel repair -w {dest_dir} {wheel}"
4343

4444
# For manylinux_2_28 we need to install the following dependencies using yum:

0 commit comments

Comments
 (0)