Skip to content

Commit 717627d

Browse files
authored
Switch rubik image build to running on arm (#92)
This significantly speeds up the build of the Rubik Pi image.
1 parent 49e6d81 commit 717627d

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
script: "./tmp/build/install_rubikpi3.sh"
1818
base_image: "https://people.canonical.com/~platform/images/qualcomm-iot/rubikpi3/ubuntu-server-24.04/x00/ubuntu-24.04-preinstalled-server-arm64+rubikpi3-20250912-127.yaml"
1919

20-
runs-on: ubuntu-24.04
20+
runs-on: ubuntu-24.04-arm
2121

2222
name: "Build for RubikPi3"
2323

mount_rubikpi3.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -exv
66

77
# Install required packages
88
sudo apt-get update
9-
sudo apt-get install -y qemu-user-static wget xz-utils
9+
sudo apt-get install -y wget xz-utils
1010
# If base_image ends with .yaml, treat it as a manifest and skip download
1111
if [[ "$base_image" == *.yaml ]]; then
1212

@@ -139,10 +139,6 @@ sudo rm -f rootfs/etc/resolv.conf
139139
sudo cp /etc/resolv.conf rootfs/etc/resolv.conf
140140
sudo cp /etc/hosts rootfs/etc/hosts
141141

142-
# Copy qemu static binaries for ARM emulation
143-
sudo cp /usr/bin/qemu-arm-static rootfs/usr/bin/ || true
144-
sudo cp /usr/bin/qemu-aarch64-static rootfs/usr/bin/ || true
145-
146142
# DEPRECATED: using bind mount instead
147143
# Copy repository into chroot (excluding mounted directories and problematic files)
148144
# sudo mkdir -p rootfs/tmp/build/
@@ -153,7 +149,7 @@ sudo mkdir -p rootfs/tmp/build/
153149
sudo mount --bind "$(pwd)" rootfs/tmp/build/
154150

155151
echo "=== Checking for sudo in chroot and running script ==="
156-
sudo chroot rootfs /usr/bin/qemu-aarch64-static /bin/bash -c "
152+
sudo chroot rootfs /bin/bash -c "
157153
set -exv
158154
export DEBIAN_FRONTEND=noninteractive
159155
if ! command -v sudo &> /dev/null; then

0 commit comments

Comments
 (0)