Skip to content

Commit

Permalink
build: bump github action/windows versions
Browse files Browse the repository at this point in the history
Note the new upload-action version requires extra work to provide a single
artifact for Python wheels.
  • Loading branch information
jgriffiths committed Sep 18, 2024
1 parent c931aa7 commit c5a3d2a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/wasm-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -36,7 +36,7 @@ jobs:

- run: cd src/wasm_package && npm test

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: libwally-npm
path: src/wasm_package/wallycore-*.tgz
19 changes: 15 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, windows-2019, macos-14]
os: [ubuntu-22.04, windows-2022, macos-14]
env:
CIBW_BEFORE_ALL_LINUX: ./tools/install_swig.sh
CIBW_BEFORE_ALL_MACOS: brew install gnu-sed swig automake libtool
Expand All @@ -26,7 +26,7 @@ jobs:
SWIG_PATH: "C:\\ProgramData\\chocolatey\\lib\\swig\\tools\\install\\swigwin-3.0.12"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0
Expand All @@ -37,7 +37,7 @@ jobs:

- name: Install qemu aarch64
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3
with:
platforms: arm64

Expand All @@ -48,6 +48,17 @@ jobs:
CIBW_ARCHS_LINUX: "x86_64 aarch64"
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: wheels-${{ matrix.os }}-${{ strategy.job-index }}
path: ./wheelhouse/*.whl

merge:
runs-on: ubuntu-latest
needs: build_wheels
steps:
- name: Merge Artifacts
uses: actions/upload-artifact/merge@v4
with:
name: all-wheels
pattern: wheels-*

0 comments on commit c5a3d2a

Please sign in to comment.