diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 5cb9bc5..45a5fb8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -135,12 +135,25 @@ jobs: linux-build-aarch64: if: ${{ github.event.inputs.inplinuxaarch64 == '' || github.event.inputs.inplinuxaarch64 == 'yes' }} runs-on: [linux-arm64] + container: "cynkra/actions-runner:2-alpine-rootful" name: Linux build aaarch env: RUST_BACKTRACE: 1 steps: + - name: Install build tools + run: | + id + pwd + ls -l + ls -ld + sudo apk add curl nodejs-current linux-headers bash gcc musl-dev g++ pkgconf make file && + cd && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rust.sh && sh rust.sh -y && + curl -LO https://github.com/goreleaser/nfpm/releases/download/v2.32.0/nfpm_2.32.0_$(arch).apk && + sudo apk add --allow-untrusted nfpm*.apk && + rm nfpm*.apk + - name: Checkout uses: actions/checkout@v4 with: @@ -148,7 +161,8 @@ jobs: - name: Build rig run: | - make linux-in-docker + . "$HOME/.cargo/env" + make linux - name: Upload build as artifact uses: actions/upload-artifact@v4 diff --git a/tools/entrypoint.sh b/tools/entrypoint.sh index 4d9a0cc..b3ffbca 100755 --- a/tools/entrypoint.sh +++ b/tools/entrypoint.sh @@ -24,7 +24,8 @@ fi rm -rf /home/$user mv /home/rigbuild /home/$user -chown $user:$group /home/rig -chown $user:$group /home/rig/.cargo +chown $user:$group /home/$user +chown $user:$group /home/$user/.cargo +export PATH=/home/$user/.cargo/bin:$PATH exec su -s /bin/sh $user sh -l -c "cd /work && $*"