From c92fbfff5de8488629a1adea36d896e48dcb415e Mon Sep 17 00:00:00 2001 From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com> Date: Sat, 8 Feb 2025 21:51:27 +0100 Subject: [PATCH] Build RPi jobs using arm-based runners --- .github/scripts/build.sh | 3 ++- .github/workflows/qt5_6.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh index 7c917fda..e0f5e4b1 100755 --- a/.github/scripts/build.sh +++ b/.github/scripts/build.sh @@ -3,6 +3,7 @@ # set environment variables if not exists [ -z "${BUILD_TYPE}" ] && BUILD_TYPE="Debug" [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64" +[ -z "${ENTRYPOINT}" ] && ENTRYPOINT="" [ -z "${PLATFORM}" ] && PLATFORM="x11" # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform) @@ -39,7 +40,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then mkdir ${GITHUB_WORKSPACE}/deploy # run docker - docker run --rm --platform=${TARGET_ARCH} \ + docker run --rm --platform=${TARGET_ARCH} ${ENTRYPOINT} \ -v "${GITHUB_WORKSPACE}/deploy:/deploy" \ -v "${GITHUB_WORKSPACE}:/source:rw" \ $REGISTRY_URL:$DOCKER_TAG \ diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml index 1a714a4c..b8a01596 100644 --- a/.github/workflows/qt5_6.yml +++ b/.github/workflows/qt5_6.yml @@ -36,7 +36,7 @@ jobs: Linux: name: 🐧 ${{ matrix.os.description }} - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os.architecture[0] == 'amd64' && 'ubuntu-22.04' || 'ubuntu-22.04-arm' }} strategy: fail-fast: false matrix: @@ -80,6 +80,7 @@ jobs: DOCKER_IMAGE: ${{ matrix.os.distribution }} DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }} PLATFORM: ${{ matrix.os.platform }} + ENTRYPOINT: ${{ matrix.os.architecture[0] == 'amd64' && '--entrypoint /usr/bin/env' || '' }} TARGET_ARCH: ${{ matrix.os.architecture[1] }} - name: 📦 Upload