From c589ebd9b1a32159211542700f2227ea15f8c4e2 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 3 Feb 2025 14:36:43 +0100 Subject: [PATCH] arm builds --- .github/workflows/linux-bazel-builds.yml | 27 ++++++++++--------- .github/workflows/linux-meson-builds.yml | 3 ++- .github/workflows/linux-other-builds.yml | 6 +++-- .github/workflows/linux-simple-builds.yml | 3 ++- .github/workflows/mac-builds-m1.yml | 2 +- .github/workflows/package-manager-builds.yaml | 3 ++- .github/workflows/validate-header-guards.yml | 2 +- .github/workflows/windows-simple-builds.yml | 2 +- 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/workflows/linux-bazel-builds.yml b/.github/workflows/linux-bazel-builds.yml index dc826ac0..a3b5c300 100644 --- a/.github/workflows/linux-bazel-builds.yml +++ b/.github/workflows/linux-bazel-builds.yml @@ -3,22 +3,23 @@ name: Bazel build on: [push, pull_request] jobs: - build_and_test_ubuntu: - name: Linux Ubuntu 22.04 Bazel build - runs-on: ubuntu-22.04 + build_and_test: + name: Linux Ubuntu Bazel build + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ubuntu-22.04, ubuntu-22.04-arm] compilation_mode: [fastbuild, dbg, opt] - steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Mount bazel cache - uses: actions/cache@v3 - with: - path: "/home/runner/.cache/bazel" - key: bazel-ubuntu22-gcc11 + - name: Mount bazel cache + uses: actions/cache@v4 + with: + path: "/home/runner/.cache/bazel" + # Use the OS name in the cache key to separate caches per platform. + key: bazel-${{ matrix.os }}-gcc11 - - name: Build Catch2 - run: | - bazelisk build --compilation_mode=${{matrix.compilation_mode}} //... + - name: Build Catch2 + run: | + bazelisk build --compilation_mode=${{ matrix.compilation_mode }} //... diff --git a/.github/workflows/linux-meson-builds.yml b/.github/workflows/linux-meson-builds.yml index 4a6cfd5b..db8cc5e1 100644 --- a/.github/workflows/linux-meson-builds.yml +++ b/.github/workflows/linux-meson-builds.yml @@ -5,9 +5,10 @@ on: [push, pull_request] jobs: build: name: meson ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}} - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ ubuntu-22.04, ubuntu-22.04-arm ] cxx: - g++-11 - clang++-11 diff --git a/.github/workflows/linux-other-builds.yml b/.github/workflows/linux-other-builds.yml index 6993c815..c0f014a7 100644 --- a/.github/workflows/linux-other-builds.yml +++ b/.github/workflows/linux-other-builds.yml @@ -8,9 +8,10 @@ on: [push, pull_request] jobs: build: name: ${{matrix.build_description}}, ${{matrix.cxx}}, C++${{matrix.std}} ${{matrix.build_type}} - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ ubuntu-22.04, ubuntu-22.04-arm ] # We add builds one by one in this case, because there are no # dimensions that are shared across the builds include: @@ -105,9 +106,10 @@ jobs: run: ctest -C ${{matrix.build_type}} -j `nproc` ${{matrix.other_ctest_args}} clang-tidy: name: clang-tidy ${{matrix.version}}, ${{matrix.build_description}}, C++${{matrix.std}} ${{matrix.build_type}} - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ ubuntu-22.04, ubuntu-22.04-arm ] include: - version: "15" build_description: all diff --git a/.github/workflows/linux-simple-builds.yml b/.github/workflows/linux-simple-builds.yml index 4cca3161..cb738885 100644 --- a/.github/workflows/linux-simple-builds.yml +++ b/.github/workflows/linux-simple-builds.yml @@ -5,9 +5,10 @@ on: [push, pull_request] jobs: build: name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}} - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ ubuntu-22.04, ubuntu-22.04-arm ] cxx: - g++-5 - g++-6 diff --git a/.github/workflows/mac-builds-m1.yml b/.github/workflows/mac-builds-m1.yml index 45629cdc..782b349b 100644 --- a/.github/workflows/mac-builds-m1.yml +++ b/.github/workflows/mac-builds-m1.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: macos-14 + runs-on: macos-15 strategy: matrix: cxx: diff --git a/.github/workflows/package-manager-builds.yaml b/.github/workflows/package-manager-builds.yaml index 6d90d140..af3b983f 100644 --- a/.github/workflows/package-manager-builds.yaml +++ b/.github/workflows/package-manager-builds.yaml @@ -5,9 +5,10 @@ on: [push, pull_request] jobs: conan_builds: name: Conan ${{matrix.conan_version}} - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} strategy: matrix: + os: [ ubuntu-22.04, ubuntu-22.04-arm] conan_version: - '1.63' - '2.1' diff --git a/.github/workflows/validate-header-guards.yml b/.github/workflows/validate-header-guards.yml index fa9d1574..728da793 100644 --- a/.github/workflows/validate-header-guards.yml +++ b/.github/workflows/validate-header-guards.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: build: # Set the type of machine to run on - runs-on: ubuntu-20.04 + runs-on: [ubuntu-22.04, ubuntu-22.04-arm] steps: - name: Checkout source code diff --git a/.github/workflows/windows-simple-builds.yml b/.github/workflows/windows-simple-builds.yml index 5fb7b8fe..91490122 100644 --- a/.github/workflows/windows-simple-builds.yml +++ b/.github/workflows/windows-simple-builds.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: [windows-2019, windows-2022] + os: [windows-2019, windows-2022, windows-2025] platform: [Win32, x64] build_type: [Debug, Release] std: [14, 17]