From c65981e83473c02426bade62f9832b343432654b Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Wed, 25 Mar 2026 22:47:41 +0000 Subject: [PATCH 1/2] Build Linux CI on Ubuntu 22 directly --- .github/workflows/autobuild.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 4b2c172202..144a997c55 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -205,7 +205,6 @@ jobs: - config_name: Linux .deb amd64 (artifacts+codeQL) target_os: linux building_on_os: ubuntu-22.04 - building_container: ubuntu:20.04 base_command: ./.github/autobuild/linux_deb.sh run_codeql: true is_main_build_target: true @@ -213,14 +212,12 @@ jobs: - config_name: Linux .deb armhf (artifacts) target_os: linux building_on_os: ubuntu-22.04-arm - building_container: ubuntu:20.04 base_command: TARGET_ARCH=armhf ./.github/autobuild/linux_deb.sh run_codeql: false - config_name: Linux .deb arm64 (artifacts) target_os: linux building_on_os: ubuntu-22.04-arm - building_container: ubuntu:20.04 base_command: TARGET_ARCH=arm64 ./.github/autobuild/linux_deb.sh run_codeql: false From 8535bb66b32e30b67b12b724b176dee4a149ad33 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Fri, 17 Jul 2026 22:18:32 +0100 Subject: [PATCH 2/2] Remove unused container steps --- .github/workflows/autobuild.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 144a997c55..122150979e 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -277,7 +277,6 @@ jobs: is_main_build_target: null runs-on: ${{ matrix.config.building_on_os }} - container: ${{ matrix.config.building_container }} steps: - name: Select Xcode version for Mac if: matrix.config.target_os == 'macos' || matrix.config.target_os == 'ios' @@ -285,25 +284,6 @@ jobs: with: xcode-version: ${{ matrix.config.xcode_version }} - - name: Set up base dependencies in container environment - if: matrix.config.building_container == 'ubuntu:20.04' - run: | - set -eu - apt-get -qq update - apt-get install -y software-properties-common sudo curl - add-apt-repository ppa:git-core/ppa - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg - sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null - apt-get -qq update - apt-get -qq -y install git-core gh - # Github Runner environments usually whitelist the default checkout directory for git. - # However, when using containers, we have to do that manually in order for git commands to work - # (e.g. in Jamulus.pro's VERSION logic): - # https://github.com/actions/runner/issues/2033 - # https://github.com/actions/checkout/issues/766 - git config --global --add safe.directory "${GITHUB_WORKSPACE}" - - name: Checkout code uses: actions/checkout@v7 with: