Merge branch 'master' into CALE

Farama-Foundation · Aug 12, 2024 · 2ea907b · 2ea907b
2 parents b482841 + 44b5211
commit 2ea907b
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 33 deletions.
diff --git 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
@@ -187,14 +187,14 @@ 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 }}"
 
       - 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.10.0-${{ matrix.wheel-name }}.whl
+        run: python -m pip install ale_py-0.10.0-${{ 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
@@ -68,14 +68,14 @@ 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 }}"
 
     - 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