From 6f47f21368390345c99bf0e8935fbb70106f36e4 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Tue, 9 Sep 2025 09:41:35 -0400 Subject: [PATCH 1/3] fix(run-tests): allow running on multiple architectures This allows running the tests on multiple architectures, so we can use GitHub's ARM runners to test on ARM. --- run-tests/action.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run-tests/action.yaml b/run-tests/action.yaml index 19a50f6..6ae7171 100644 --- a/run-tests/action.yaml +++ b/run-tests/action.yaml @@ -47,7 +47,8 @@ runs: run: | # If we got a manifest file then parse the revision from it if ls manifest-amd64.yaml &>/dev/null; then - rev="$(yq -r '.revision' manifest-amd64.yaml)" + arch="$(dpkg --print-architecture)" + rev="$(yq -r '.revision' manifest-$arch.yaml)" echo "Installing snap revision '${rev}' from build manifest" sudo snap install "${snap_name}" --revision "${rev}" else From 7a656263cfbe6723dd968a51e382d82853f742f2 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Tue, 9 Sep 2025 09:43:57 -0400 Subject: [PATCH 2/3] fix: quotes --- run-tests/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests/action.yaml b/run-tests/action.yaml index 6ae7171..7349139 100644 --- a/run-tests/action.yaml +++ b/run-tests/action.yaml @@ -48,7 +48,7 @@ runs: # If we got a manifest file then parse the revision from it if ls manifest-amd64.yaml &>/dev/null; then arch="$(dpkg --print-architecture)" - rev="$(yq -r '.revision' manifest-$arch.yaml)" + rev="$(yq -r '.revision' "manifest-${arch}.yaml")" echo "Installing snap revision '${rev}' from build manifest" sudo snap install "${snap_name}" --revision "${rev}" else From a11bf5509836ef197f2fa61237ebf002b78fa05e Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Tue, 9 Sep 2025 10:25:13 -0400 Subject: [PATCH 3/3] fix: pr suggestion Caught me only half-doing it Signed-off-by: Alex Lowe --- run-tests/action.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-tests/action.yaml b/run-tests/action.yaml index 7349139..7e55e69 100644 --- a/run-tests/action.yaml +++ b/run-tests/action.yaml @@ -46,8 +46,8 @@ runs: snap_name: ${{ steps.snapcraft-yaml.outputs.snap-name }} run: | # If we got a manifest file then parse the revision from it - if ls manifest-amd64.yaml &>/dev/null; then - arch="$(dpkg --print-architecture)" + arch="$(dpkg --print-architecture)" + if ls "manifest-${arch}.yaml" &>/dev/null; then rev="$(yq -r '.revision' "manifest-${arch}.yaml")" echo "Installing snap revision '${rev}' from build manifest" sudo snap install "${snap_name}" --revision "${rev}"