From 997093986d98446b30520e0731670a9162a65dd0 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 2 Feb 2025 22:48:56 -0500 Subject: [PATCH] ci(docker): fix debian arm builds (#3627) --- .github/workflows/ci-docker.yml | 2 +- scripts/linux_build.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 128de505c73..e66a33772ba 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -123,7 +123,7 @@ jobs: docker: needs: [check_dockerfiles, setup_release] if: ${{ needs.check_dockerfiles.outputs.dockerfiles }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: packages: write contents: write diff --git a/scripts/linux_build.sh b/scripts/linux_build.sh index 4cf4c101ad5..e6a62d7e8c0 100644 --- a/scripts/linux_build.sh +++ b/scripts/linux_build.sh @@ -3,6 +3,7 @@ set -e # Default value for arguments appimage_build=0 +num_processors=$(nproc) publisher_name="Third Party Publisher" publisher_website="" publisher_issue_url="https://app.lizardbyte.dev/support" @@ -27,6 +28,7 @@ Options: -h, --help Display this help message. -s, --sudo-off Disable sudo command. --appimage-build Compile for AppImage, this will not create the AppImage, just the executable. + --num-processors The number of processors to use for compilation. Default is the value of 'nproc'. --publisher-name The name of the publisher (not developer) of the application. --publisher-website The URL of the publisher's website. --publisher-issue-url The URL of the publisher's support site or issue tracker. @@ -53,6 +55,9 @@ while getopts ":hs-:" opt; do appimage_build=1 skip_libva=1 ;; + num-processors=*) + num_processors="${OPTARG#*=}" + ;; publisher-name=*) publisher_name="${OPTARG#*=}" ;; @@ -367,7 +372,7 @@ function run_install() { tar -xzf "${build_dir}/doxygen.tar.gz" cd "doxygen-${doxygen_min}" cmake -DCMAKE_BUILD_TYPE=Release -G="Ninja" -B="build" -S="." - ninja -C "build" + ninja -C "build" -j"${num_processors}" ninja -C "build" install else echo "Doxygen version too low, skipping docs"