From cf298a23dc29a7da5b6abb041cddd5dbd7254f28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 20:45:06 +0100 Subject: [PATCH 1/2] Bump pypa/cibuildwheel from 2.19.2 to 2.20.0 (#551) --- .github/workflows/ci.yml | 2 +- .github/workflows/pypi.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7296fde8d..781eccd97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -187,7 +187,7 @@ jobs: run: ./scripts/download_unpack_roms.sh - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 + uses: pypa/cibuildwheel@v2.20.0 env: CIBW_ARCHS: "${{ matrix.arch }}" diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index ced5b642b..624dccbb4 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -68,7 +68,7 @@ jobs: run: ./scripts/download_unpack_roms.sh - name: Build wheels - uses: pypa/cibuildwheel@v2.19.2 + uses: pypa/cibuildwheel@v2.20.0 env: CIBW_ARCHS: "${{ matrix.arch }}" From 44b5211be73cc34ac2434ac2d203b7ec528f34c8 Mon Sep 17 00:00:00 2001 From: Mark Towers Date: Sun, 11 Aug 2024 14:51:22 +0100 Subject: [PATCH 2/2] Bump `actions/download-artifact` and `actions/upload-artifact` v4 (#548) --- .github/docker/manylinux-vcpkg.Dockerfile | 2 +- .github/workflows/ci.yml | 72 +++++++++++++++-------- .github/workflows/pypi.yml | 13 ++-- 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/.github/docker/manylinux-vcpkg.Dockerfile b/.github/docker/manylinux-vcpkg.Dockerfile index 6f5ca2a53..f9603bee3 100644 --- a/.github/docker/manylinux-vcpkg.Dockerfile +++ b/.github/docker/manylinux-vcpkg.Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/pypa/manylinux2014_x86_64 -LABEL org.opencontainers.image.source https://github.com/Farama-Foundation/Arcade-Learning-Environment +LABEL org.opencontainers.image.source=https://github.com/Farama-Foundation/Arcade-Learning-Environment RUN yum install -y curl unzip zip tar diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 781eccd97..5116f9ad8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,9 +192,9 @@ jobs: CIBW_ARCHS: "${{ matrix.arch }}" - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ runner.os }}-${{ matrix.arch }} path: ./wheelhouse/*.whl test-wheels: @@ -209,69 +209,89 @@ jobs: # ale_py-0.x.x-cp310-cp310-macosx_11_0_arm64.whl # ale_py-0.x.x-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl # ale_py-0.x.x-cp310-cp310-win_amd64.whl - - runs-on: ubuntu-latest # arch: x86_64 + - runs-on: ubuntu-latest python: '3.8' wheel-name: 'cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64' - - runs-on: ubuntu-latest # arch: x86_64 + arch: 'x86_64' + - runs-on: ubuntu-latest python: '3.9' wheel-name: 'cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64' - - runs-on: ubuntu-latest # arch: x86_64 + arch: 'x86_64' + - runs-on: ubuntu-latest python: '3.10' wheel-name: 'cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64' - - runs-on: ubuntu-latest # arch: x86_64 + arch: 'x86_64' + - runs-on: ubuntu-latest python: '3.11' wheel-name: 'cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64' - - runs-on: ubuntu-latest # arch: x86_64 + arch: 'x86_64' + - runs-on: ubuntu-latest python: '3.12' wheel-name: 'cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64' + arch: 'x86_64' - - runs-on: windows-latest # arch: AMD64 + - runs-on: windows-latest python: '3.8' wheel-name: 'cp38-cp38-win_amd64' - - runs-on: windows-latest # arch: AMD64 + arch: AMD64 + - runs-on: windows-latest python: '3.9' wheel-name: 'cp39-cp39-win_amd64' - - runs-on: windows-latest # arch: AMD64 + arch: AMD64 + - runs-on: windows-latest python: '3.10' wheel-name: 'cp310-cp310-win_amd64' - - runs-on: windows-latest # arch: AMD64 + arch: AMD64 + - runs-on: windows-latest python: '3.11' wheel-name: 'cp311-cp311-win_amd64' - - runs-on: windows-latest # arch: AMD64 + arch: AMD64 + - runs-on: windows-latest python: '3.12' wheel-name: 'cp312-cp312-win_amd64' + arch: AMD64 - - runs-on: macos-12 # arch: x86_64 + - runs-on: macos-12 python: '3.8' wheel-name: 'cp38-cp38-macosx_10_15_x86_64' - - runs-on: macos-12 # arch: x86_64 + arch: x86_64 + - runs-on: macos-12 python: '3.9' wheel-name: 'cp39-cp39-macosx_10_15_x86_64' - - runs-on: macos-12 # arch: x86_64 + arch: x86_64 + - runs-on: macos-12 python: '3.10' wheel-name: 'cp310-cp310-macosx_10_15_x86_64' - - runs-on: macos-12 # arch: x86_64 + arch: x86_64 + - runs-on: macos-12 python: '3.11' wheel-name: 'cp311-cp311-macosx_10_15_x86_64' - - runs-on: macos-12 # arch: x86_64 + arch: x86_64 + - runs-on: macos-12 python: '3.12' wheel-name: 'cp312-cp312-macosx_10_15_x86_64' + arch: x86_64 - - runs-on: macos-14 # arch: arm64 + - runs-on: macos-14 python: '3.8' wheel-name: 'cp38-cp38-macosx_11_0_arm64' - - runs-on: macos-14 # arch: arm64 + arch: arm64 + - runs-on: macos-14 python: '3.9' wheel-name: 'cp39-cp39-macosx_11_0_arm64' - - runs-on: macos-14 # arch: arm64 + arch: arm64 + - runs-on: macos-14 python: '3.10' wheel-name: 'cp310-cp310-macosx_11_0_arm64' - - runs-on: macos-14 # arch: arm64 + arch: arm64 + - runs-on: macos-14 python: '3.11' wheel-name: 'cp311-cp311-macosx_11_0_arm64' - - runs-on: macos-14 # arch: arm64 + arch: arm64 + - runs-on: macos-14 python: '3.12' wheel-name: 'cp312-cp312-macosx_11_0_arm64' + arch: arm64 runs-on: ${{ matrix.runs-on }} @@ -281,15 +301,15 @@ jobs: with: python-version: ${{ matrix.python }} - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v4 with: - name: wheels + name: wheels-${{ runner.os }}-${{ matrix.arch }} - - run: ls wheels/ + - run: ls - name: Build # wildcarding doesn't work for some reason, therefore, update the project version here - run: python -m pip install wheels/ale_py-0.9.1-${{ matrix.wheel-name }}.whl + run: python -m pip install ale_py-0.9.1-${{ matrix.wheel-name }}.whl - name: Install Gymnasium and pytest run: python -m pip install gymnasium>=1.0.0a2 pytest diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 624dccbb4..0b4222668 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -73,9 +73,9 @@ jobs: CIBW_ARCHS: "${{ matrix.arch }}" - name: Upload wheels - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.runs-on }}-${{ matrix.arch }} path: ./wheelhouse/*.whl push-pypi: @@ -86,9 +86,14 @@ jobs: id-token: write steps: - - uses: actions/download-artifact@v1 + - uses: actions/download-artifact@v4 with: - name: wheels + name: | + wheels-windows-latest-x86_64/ + wheels-ubuntu-latest-ARM64/ + wheels-macos-12-x86_64/ + wheels-macos-12-arm64/ + path: wheels - name: Publish to PyPi test uses: pypa/gh-action-pypi-publish@release/v1