diff --git a/.github/actions/release-archive/action.yml b/.github/actions/release-archive/action.yml index 0b4f7fb091..9e239b7d24 100644 --- a/.github/actions/release-archive/action.yml +++ b/.github/actions/release-archive/action.yml @@ -13,9 +13,15 @@ runs: id: archive shell: bash run: | - OSNAME=$(echo ${{ inputs.os }} | sed 's/-latest//') + declare -A OSNAME=( + [ubuntu-20.04]="linux-x64", + [ubuntu-24.04-arm]="linux-arm64", + [macos-14]="macos-14", + [windows-latest]="windows-x64", + [wasi]="wasi", + ) VERSION=${{ github.event.release.tag_name || github.sha }} - PKGNAME="wabt-$VERSION-$OSNAME" + PKGNAME="wabt-$VERSION-${OSNAME[${{ inputs.os }}]}" TARBALL=$PKGNAME.tar.gz SHASUM=$PKGNAME.tar.gz.sha256 mv install wabt-$VERSION diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cbbf183040..cf50061fd4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-13, macos-latest, windows-latest] + os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest, windows-latest] steps: - uses: actions/setup-python@v5 with: @@ -40,7 +40,7 @@ jobs: submodules: true - name: install ninja (linux) run: sudo apt-get install ninja-build - if: matrix.os == 'ubuntu-latest' + if: startsWith(matrix.os, 'ubuntu-') - name: install ninja (osx) run: brew install ninja if: matrix.os == 'macos-13' || matrix.os == 'macos-latest' diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index db9c64c396..f0c46bd06c 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -15,7 +15,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-14, windows-latest] + os: [ubuntu-20.04, ubuntu-24.04-arm, macos-14, windows-latest] defaults: run: shell: bash