macos-12 with upgrade

jpy-consortium · Jan 11, 2024 · cd9aa25 · cd9aa25
1 parent 9533316
commit cd9aa25
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,20 +58,20 @@ jobs:
 #          - { machine: 'windows-2022', python: '3.10', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
 #          - { machine: 'windows-2022', python: '3.11', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
           - { machine: 'windows-2022', python: '3.12', arch: 'amd64', cmd: '.\.github\env\Windows\bdist-wheel.ps1' }
-#          - { machine: 'macos-13-xlarge', python: '3.6', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-#          - { machine: 'macos-13-xlarge', python: '3.7', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-#          - { machine: 'macos-13-xlarge', python: '3.8', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-#          - { machine: 'macos-13-xlarge', python: '3.9', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-          - { machine: 'macos-13-xlarge', python: '3.10', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-          - { machine: 'macos-13-xlarge', python: '3.11', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
-          - { machine: 'macos-13-xlarge', python: '3.12', arch: 'arm64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.6', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.7', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.8', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.9', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.10', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.11', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
+          - { machine: 'macos-12', python: '3.12', arch: 'amd64', cmd: '.github/env/macOS/bdist-wheel.sh' }
           # Add M1 powered runners when available
           # https://github.com/jpy-consortium/jpy/issues/110
 
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.info.python }}
 
@@ -81,9 +81,13 @@ jobs:
           distribution: 'zulu'
           java-version: '8'
 
+      - run: |
+          pip install --upgrade pip
+          pip install --upgrade setuptools
+
       - run: ${{ matrix.info.cmd }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: build-${{ matrix.info.python }}-${{ matrix.info.machine }}-${{ matrix.info.arch }}
           path: dist/*.whl