Skip to content

Commit c7649df

Browse files
committed
See if ubuntu-24.04-arm works
Signed-off-by: Akihiro Suda <[email protected]>
1 parent be564a1 commit c7649df

File tree

2 files changed

+36
-10
lines changed

2 files changed

+36
-10
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@ on:
99

1010
jobs:
1111
test:
12-
runs-on: ubuntu-24.04
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
runner: ["ubuntu-24.04", "ubuntu-24.04-arm"]
16+
runs-on: ${{ matrix.runner }}
1317
steps:
1418
- uses: actions/checkout@v4
1519
- uses: ./setup
1620
id: lima-actions-setup
1721
- uses: actions/cache@v4
1822
with:
1923
path: ~/.cache/lima
20-
key: lima-${{ steps.lima-actions-setup.outputs.version }}
24+
key: lima-${{ steps.lima-actions-setup.outputs.version }}-${{ matrix.runner }}
2125
- run: limactl start --plain --name=default --cpus=1 --memory=1 template://fedora
2226
- uses: ./ssh
2327
- run: rsync -a -e ssh . lima-default:/tmp/repo

setup/action.yml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,35 @@ runs:
1919
shell: bash
2020
run: |
2121
set -eux -o pipefail
22-
[ "$(uname)" = "Linux" ]
23-
[ "$(uname -m)" = "x86_64" ]
24-
sudo apt-get update -qq
25-
sudo apt-get install -qqy --no-install-recommends ovmf qemu-system-x86 qemu-utils
26-
sudo modprobe kvm
27-
# `sudo usermod -aG kvm $(whoami)` does not take an effect on GHA
28-
sudo chown $(whoami) /dev/kvm
22+
case "$(uname)" in
23+
Linux)
24+
qemu_arch=""
25+
case "$(uname -m)" in
26+
x86_64)
27+
qemu_arch=x86
28+
;;
29+
aarch64)
30+
qemu_arch=arm
31+
;;
32+
*)
33+
echo >&2 "Unsupported host architecture"
34+
exit 1
35+
;;
36+
esac
37+
sudo apt-get update -qq
38+
sudo apt-get install -qqy --no-install-recommends ovmf qemu-system-${qemu_arch} qemu-utils
39+
sudo modprobe kvm
40+
# `sudo usermod -aG kvm $(whoami)` does not take an effect on GHA
41+
sudo chown $(whoami) /dev/kvm
42+
;;
43+
Darwin)
44+
brew install qemu
45+
;;
46+
*)
47+
echo >&2 "Unsupported host operating system"
48+
exit 1
49+
;;
50+
esac
2951
- name: "Set up Lima"
3052
id: "setup-lima"
3153
env:
@@ -37,7 +59,7 @@ runs:
3759
if [ "${VERSION}" = "latest" ]; then
3860
VERSION="$(curl -fsSL -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/lima-vm/lima/releases/latest | jq -r .tag_name)"
3961
fi
40-
FILE="lima-${VERSION:1}-Linux-x86_64.tar.gz"
62+
FILE="lima-${VERSION:1}-$(uname)-$(uname -m).tar.gz"
4163
curl -fOSL https://github.com/lima-vm/lima/releases/download/${VERSION}/${FILE}
4264
gh attestation verify --owner=lima-vm "${FILE}"
4365
sudo tar Cxzf /usr/local "${FILE}"

0 commit comments

Comments
 (0)