GHA: make use of the new ubuntu-22.04-arm runner.

agarny · web-flow · commit 06019b341e51 · 2025-01-20T23:25:51.000+13:00
diff --git a/.github/workflows/buildThirdPartyLibrary.yml b/.github/workflows/buildThirdPartyLibrary.yml
@@ -39,9 +39,7 @@ jobs:
             os: ubuntu-22.04
             build_type: Release
           - name: 'Linux (ARM)'
-            os: ubuntu-22.04
-            arch: arm
-            context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
+            os: ubuntu-22.04-arm
             build_type: Release
           - name: 'macOS (Intel)'
             os: macos-14
@@ -58,17 +56,12 @@ jobs:
     steps:
       - name: Check out libOpenCOR
         uses: actions/checkout@v4
-      - name: Install ARM compiler
-        if: ${{ matrix.arch == 'arm' }}
-        run: |
-          sudo apt update
-          sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
       - name: Install buildcache
-        uses: cscouto/buildcache-action@v1
+        uses: opencor/buildcache-action@v1
         with:
-          cache_key: libraries-${{ matrix.os }}-${{ matrix.shared_libs }}
+          cache_key: ${{ inputs.third_party_library_name }}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.build_type }}
       - name: Configure MSVC (to build an Intel-based version of llvm-tblgen and clang-tblgen; only when building LLVM+Clang on Windows ARM)
         if: ${{ (inputs.third_party_library_name == 'LLVMClang') && (runner.os == 'Windows') && (matrix.arch == 'amd64_arm64') }}
         uses: ilammy/msvc-dev-cmd@v1
@@ -92,13 +85,13 @@ jobs:
         run: |
           mkdir build
           cd build
-          ${{ matrix.context }} cmake -G Ninja ${{ matrix.target_arch }} -DBUILD_TYPE=${{ matrix.build_type }} -DONLY_BUILD_THIRD_PARTY_LIBRARIES=ON -DPREBUILT_LLVMCLANG=OFF ${{ env.DLLVMCLANG_LLVM_TABLEGEN }} ${{ env.DLLVMCLANG_CLANG_TABLEGEN }} ..
+          cmake -G Ninja ${{ matrix.target_arch }} -DBUILD_TYPE=${{ matrix.build_type }} -DONLY_BUILD_THIRD_PARTY_LIBRARIES=ON -DPREBUILT_LLVMCLANG=OFF ${{ env.DLLVMCLANG_LLVM_TABLEGEN }} ${{ env.DLLVMCLANG_CLANG_TABLEGEN }} ..
       - name: Configure libOpenCOR (only when NOT building LLVM+Clang)
         if: ${{ inputs.third_party_library_name != 'LLVMClang' }}
         run: |
           mkdir build
           cd build
-          ${{ matrix.context }} cmake -G Ninja ${{ matrix.target_arch }} -DBUILD_TYPE=${{ matrix.build_type }} -DONLY_BUILD_THIRD_PARTY_LIBRARIES=ON -DPREBUILT_${{ inputs.third_party_library_name }}=OFF ..
+          cmake -G Ninja ${{ matrix.target_arch }} -DBUILD_TYPE=${{ matrix.build_type }} -DONLY_BUILD_THIRD_PARTY_LIBRARIES=ON -DPREBUILT_${{ inputs.third_party_library_name }}=OFF ..
       - name: Upload library artifact
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
         uses: actions/upload-artifact@v4
@@ -120,7 +113,7 @@ jobs:
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
       - name: Install buildcache
-        uses: cscouto/buildcache-action@v1
+        uses: opencor/buildcache-action@v1
         with:
           cache_key: webassembly
       - name: Install Emscripten
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -38,28 +38,28 @@ jobs:
             os: ubuntu-22.04
             shared_libs: ON
           - name: 'Linux static library (ARM)'
-            os: ubuntu-22.04
-            arch: arm
+            os: ubuntu-22.04-arm
             shared_libs: OFF
-            context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
           - name: 'Linux shared library (ARM)'
-            os: ubuntu-22.04
-            arch: arm
+            os: ubuntu-22.04-arm
             shared_libs: ON
-            context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
           - name: 'macOS static library (Intel)'
             os: macos-14
+            arch: Intel # Only used for buildcache's cache key.
             shared_libs: OFF
             target_arch: " -DTARGET_ARCHITECTURE=Intel"
           - name: 'macOS shared library (Intel)'
             os: macos-14
+            arch: Intel # Only used for buildcache's cache key.
             shared_libs: ON
             target_arch: " -DTARGET_ARCHITECTURE=Intel"
           - name: 'macOS static library (ARM)'
             os: macos-14
+            arch: ARM # Only used for buildcache's cache key.
             shared_libs: OFF
           - name: 'macOS shared library (ARM)'
             os: macos-14
+            arch: ARM # Only used for buildcache's cache key.
             shared_libs: ON
     env:
       BUILDCACHE_ACCURACY: STRICT
@@ -69,17 +69,12 @@ jobs:
     steps:
       - name: Check out libOpenCOR
         uses: actions/checkout@v4
-      - name: Install ARM compiler
-        if: ${{ matrix.arch == 'arm' }}
-        run: |
-          sudo apt update
-          sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
       - name: Install buildcache
-        uses: cscouto/buildcache-action@v1
+        uses: opencor/buildcache-action@v1
         with:
-          cache_key: libraries-${{ matrix.os }}-${{ matrix.shared_libs }}
+          cache_key: cd-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.shared_libs }}
       - name: Configure MSVC
         if: ${{ runner.os == 'Windows' }}
         uses: ilammy/msvc-dev-cmd@v1
@@ -89,7 +84,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          ${{ matrix.context }} cmake -G Ninja ${{ matrix.target_arch }} -DBUILD_TYPE=Release -DCODE_ANALYSIS=OFF -DCODE_COVERAGE=OFF -DDOCUMENTATION=OFF -DJAVASCRIPT_BINDINGS=OFF -DMEMORY_CHECKS=OFF -DPYTHON_BINDINGS=OFF -DPYTHON_UNIT_TESTING=OFF -DSHARED_LIBS=${{ matrix.shared_libs }} -DUNIT_TESTING=OFF ..
+          cmake -G Ninja ${{ matrix.target_arch }} -DBUILD_TYPE=Release -DCODE_ANALYSIS=OFF -DCODE_COVERAGE=OFF -DDOCUMENTATION=OFF -DJAVASCRIPT_BINDINGS=OFF -DMEMORY_CHECKS=OFF -DPYTHON_BINDINGS=OFF -DPYTHON_UNIT_TESTING=OFF -DSHARED_LIBS=${{ matrix.shared_libs }} -DUNIT_TESTING=OFF ..
       - name: Build libOpenCOR
         run: |
           cd build
@@ -175,9 +170,9 @@ jobs:
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
       - name: Install buildcache
-        uses: cscouto/buildcache-action@v1
+        uses: opencor/buildcache-action@v1
         with:
-          cache_key: webassembly
+          cache_key: cd-webassembly
       - name: Install Emscripten
         run: brew install emscripten
       - name: Configure libOpenCOR
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -107,9 +107,8 @@ jobs:
             unit_testing: ON
             target: unit_testing
             install_uninstall_and_package: ON
-          - name: 'Linux static library (ARM) (no tests)'
-            os: ubuntu-22.04
-            arch: arm
+          - name: 'Linux static library (ARM)'
+            os: ubuntu-22.04-arm
             build_type: Release
             code_analysis: OFF
             code_coverage: OFF
@@ -120,13 +119,11 @@ jobs:
             python_bindings: OFF
             python_unit_testing: OFF
             shared_libs: OFF
-            unit_testing: OFF
+            unit_testing: ON
             target: unit_testing
             install_uninstall_and_package: ON
-            context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
-          - name: 'Linux shared library (ARM) (no tests)'
-            os: ubuntu-22.04
-            arch: arm
+          - name: 'Linux shared library (ARM)'
+            os: ubuntu-22.04-arm
             build_type: Release
             code_analysis: OFF
             code_coverage: OFF
@@ -137,10 +134,9 @@ jobs:
             python_bindings: OFF
             python_unit_testing: OFF
             shared_libs: ON
-            unit_testing: OFF
+            unit_testing: ON
             target: unit_testing
             install_uninstall_and_package: ON
-            context: CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++
           - name: 'macOS static library (Intel)'
             os: macos-14
             build_type: Release
@@ -373,21 +369,16 @@ jobs:
     steps:
       - name: Check out libOpenCOR
         uses: actions/checkout@v4
-      - name: Install ARM compiler
-        if: ${{ matrix.arch == 'arm' }}
-        run: |
-          sudo apt update
-          sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
       - name: Install Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.13'
       - name: Install CMake and Ninja
         uses: lukka/get-cmake@latest
       - name: Install buildcache
-        uses: cscouto/buildcache-action@v1
+        uses: opencor/buildcache-action@v1
         with:
-          cache_key: ${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.code_analysis }}-${{ matrix.code_coverage }}-${{ matrix.documentation }}-${{ matrix.javascript_bindings }}-${{ matrix.javascript_unit_testing }}-${{ matrix.memory_checks }}-${{ matrix.python_bindings }}-${{ matrix.python_unit_testing }}-${{ matrix.shared_libs }}-${{ matrix.unit_testing }}-${{ matrix.target }}
+          cache_key: ci-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.code_analysis }}-${{ matrix.code_coverage }}-${{ matrix.documentation }}-${{ matrix.javascript_bindings }}-${{ matrix.javascript_unit_testing }}-${{ matrix.memory_checks }}-${{ matrix.python_bindings }}-${{ matrix.python_unit_testing }}-${{ matrix.shared_libs }}-${{ matrix.unit_testing }}-${{ matrix.target }}
       - name: Configure MSVC
         if: ${{ runner.os == 'Windows' }}
         uses: ilammy/msvc-dev-cmd@v1
