Skip to content

Commit

Permalink
Merge branch 'pygame-community:main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
gavinmorrow authored Oct 30, 2024
2 parents c3b05a5 + 1814397 commit 4734eca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-debian-multiarch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
- uses: actions/[email protected]

- name: Build sources and run tests
uses: uraimo/run-on-arch-action@v2.7.2
uses: uraimo/run-on-arch-action@v2.8.1
id: build
with:
arch: ${{ matrix.base_image && 'none' || matrix.arch }}
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
done
- name: Test armv7 wheel on armv6
uses: uraimo/run-on-arch-action@v2.7.2
uses: uraimo/run-on-arch-action@v2.8.1
with:
arch: armv6
distro: bookworm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Test for Mac Deps cache hit
id: macdep-cache
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
# The hash of all files in buildconfig manylinux-build and macdependencies is
Expand Down Expand Up @@ -119,14 +119,14 @@ jobs:
- uses: actions/[email protected]

- name: pip cache
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: ~/Library/Caches/pip # This cache path is only right on mac
key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }}

- name: Fetch Mac deps
id: macdep-cache
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
Expand Down

0 comments on commit 4734eca

Please sign in to comment.