Skip to content

Commit

Permalink
ci: Test ubuntu-22.04-arm and ubuntu-24.04-arm
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jan 17, 2025
1 parent d125c0a commit 1b8d452
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ jobs:
include:
# NB: Sync list with https://github.com/taiki-e/checkout-action/blob/HEAD/.github/workflows/ci.yml
- os: ubuntu-22.04
- os: ubuntu-22.04-arm
- os: ubuntu-24.04
- os: ubuntu-24.04-arm
- os: ubuntu-22.04
tool: major.minor.patch
- os: ubuntu-22.04
Expand Down
4 changes: 2 additions & 2 deletions main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -740,9 +740,9 @@ for tool in "${tools[@]}"; do
read_manifest "${tool}" "${version}"
if [[ "${download_info}" == "null" ]]; then
if [[ "${rust_crate}" == "null" ]]; then
bail "${tool}@${version} for '${host_os}' is not supported"
bail "${tool}@${version} for '${host_arch}_${host_os}' is not supported"
fi
warn "${tool}@${version} for '${host_os}' is not supported; fallback to cargo-binstall"
warn "${tool}@${version} for '${host_arch}_${host_os}' is not supported; fallback to cargo-binstall"
case "${version}" in
latest) unsupported_tools+=("${rust_crate}") ;;
*) unsupported_tools+=("${rust_crate}@${version}") ;;
Expand Down
14 changes: 12 additions & 2 deletions tools/ci/tool-list.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ case "$(uname -s)" in
;;
*) bail "unrecognized OS type '$(uname -s)'" ;;
esac
# See main.sh
case "$(uname -m)" in
aarch64 | arm64) host_arch=aarch64 ;;
xscale | arm | armv*l) bail "32-bit Arm runner is not supported yet by this action; if you need support for this platform, please submit an issue at <https://github.com/taiki-e/install-action>" ;;
*) host_arch=x86_64 ;;
esac

tools=()
for manifest in tools/codegen/base/*.json; do
Expand All @@ -120,9 +126,13 @@ for manifest in tools/codegen/base/*.json; do
continue
fi
case "${host_os}" in
linux*) ;;
linux*)
if [[ "${host_arch}" != "x86_64" ]] && [[ "$(jq -r ".platform.${host_arch}_${host_os}_gnu" "${manifest}")" == "null" ]] && [[ "$(jq -r ".platform.${host_arch}_${host_os}_musl" "${manifest}")" == "null" ]]; then
continue
fi
;;
*)
if [[ "$(jq -r ".platform.x86_64_${host_os}" "${manifest}")" == "null" ]]; then
if [[ "$(jq -r ".platform.x86_64_${host_os}" "${manifest}")" == "null" ]] && [[ "$(jq -r ".platform.${host_arch}_${host_os}" "${manifest}")" == "null" ]]; then
continue
fi
;;
Expand Down

0 comments on commit 1b8d452

Please sign in to comment.