From f4189765bbcec571cde240c63baf8557e7fbcbc5 Mon Sep 17 00:00:00 2001 From: "Gabriel A. Devenyi" Date: Thu, 23 May 2024 16:13:19 -0400 Subject: [PATCH 1/2] Add more ubuntu build runs for CI --- .github/workflows/build.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46eab5f1..69f1f49e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,9 +14,19 @@ jobs: matrix: config: - { - name: "Ubuntu GCC", artifact: "qi-linux.tar.gz", + name: "Ubuntu 24.04 GCC", artifact: "qi-linux-ubuntu24.04.tar.gz", + os: ubuntu-24.04, + cc: "gcc", cxx: "g++" + } + - { + name: "Ubuntu 22.04 GCC", artifact: "qi-linux-ubuntu22.04.tar.gz", os: ubuntu-22.04, - cc: "gcc-11", cxx: "g++-11" + cc: "gcc", cxx: "g++" + } + - { + name: "Ubuntu 20.04 GCC", artifact: "qi-linux-ubuntu20.04.tar.gz", + os: ubuntu-20.04, + cc: "gcc", cxx: "g++" } - { name: "macOS", artifact: "qi-macos.tar.gz", @@ -37,7 +47,7 @@ jobs: brew install gnu-tar automake autoconf autoconf-archive else sudo apt-get update - sudo apt-get install automake autoconf autoconf-archive + sudo apt-get install -y automake autoconf autoconf-archive make fi - name: Restore vcpkg binary cache @@ -104,4 +114,3 @@ jobs: artifacts: ${{github.workspace}}/${{matrix.config.artifact}} artifactErrorsFailBuild: true draft: true - \ No newline at end of file From 18edddb86aeb838f065809b7906fc2e3b5c9ee8a Mon Sep 17 00:00:00 2001 From: "Gabriel A. Devenyi" Date: Wed, 15 Apr 2026 10:54:40 -0400 Subject: [PATCH 2/2] Fix potential cache collision Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69f1f49e..1f21f6f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,28 +9,30 @@ jobs: build: name: ${{matrix.config.name}} runs-on: ${{matrix.config.os}} + env: + VCPKG_CACHE_IMAGE: ${{matrix.config.cache_id}} strategy: fail-fast: false matrix: config: - { name: "Ubuntu 24.04 GCC", artifact: "qi-linux-ubuntu24.04.tar.gz", - os: ubuntu-24.04, + os: ubuntu-24.04, cache_id: ubuntu-24.04, cc: "gcc", cxx: "g++" } - { name: "Ubuntu 22.04 GCC", artifact: "qi-linux-ubuntu22.04.tar.gz", - os: ubuntu-22.04, + os: ubuntu-22.04, cache_id: ubuntu-22.04, cc: "gcc", cxx: "g++" } - { name: "Ubuntu 20.04 GCC", artifact: "qi-linux-ubuntu20.04.tar.gz", - os: ubuntu-20.04, + os: ubuntu-20.04, cache_id: ubuntu-20.04, cc: "gcc", cxx: "g++" } - { name: "macOS", artifact: "qi-macos.tar.gz", - os: macos-12, + os: macos-12, cache_id: macos-12, cc: "clang", cxx: "clang++" }