Skip to content

ci: Add ubuntu-24.04-arm regular CI and release artifact #2558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/actions/release-archive/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just drop the -14 and use -x64 here too?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't macos-14 an arm64?

Copy link
Member

@sbc100 sbc100 Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know .. if its is then we should call this -macos-arm64

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there not still an x86 macos runner available?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not since macos-14, aside from large runners (which don't really count since you can't use them for free)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we call this -macos-arm64 then?

I guess that means that x86_64 macos users don't get pre-compiled releases?

[windows-latest]="windows-x64",
[wasi]="wasi",
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've never actually used declare before. Looks powerful, and scary :)

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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its kind of unfortunate that this is called -arm and not -arm64 or -aarch64 (which are the two names by which I know this architecture).

Perhaps we can avoid directly using the OS names in artifact names?

For example, can we map ubuntu-20.04 to linux-x64 and ubuntu-24.04-arm to linux-arm64`?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I can't say I understand the naming that GitHub went with. The only thing that might make sense sense is that since these images are "partner images" from some contract they have with ARM Ltd., it was named by a program manager? From a developer standpoint it should really be -arm64 or -aarch64. I'll see if I can come up with a not-awful mapping in the action's yml.

steps:
- uses: actions/setup-python@v5
with:
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading