Skip to content

Commit

Permalink
fix upload-artifacts no longer allowing merges
Browse files Browse the repository at this point in the history
  • Loading branch information
N-Coder authored Apr 3, 2024
1 parent 72d8474 commit d03aed1
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, macos-13, windows-latest ]
os: [ ubuntu-latest, macos-14, macos-13, windows-latest ]

steps:
- uses: actions/checkout@v4
Expand All @@ -34,7 +34,7 @@ jobs:
- uses: actions/upload-artifact@v4
if: always()
with:
name: wheels
name: wheels-${{ matrix.os }}
path: ./wheelhouse/*.whl

check_contents:
Expand All @@ -52,6 +52,12 @@ jobs:
with:
python-version: '3.x'

- uses: actions/upload-artifact/merge@v4
with:
name: "wheels"
pattern: "wheels-*"
delete-merged: true

- name: Download wheels
uses: actions/download-artifact@v4
with:
Expand All @@ -75,12 +81,12 @@ jobs:

test:
name: Test on ${{ matrix.os }}
needs: build_wheels
needs: check_contents
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest, macos-latest, macos-13, windows-latest ]
os: [ ubuntu-latest, macos-14, macos-13, windows-latest ]

steps:
- uses: actions/checkout@v4
Expand Down

0 comments on commit d03aed1

Please sign in to comment.