Use gcc-12 on Ubuntu 24.04 builds (#61)

* Use gcc-12 on Ubuntu 24.04 builds * Fix matrix * Fix matrix * Fix matrix * Update nx version
Seagate · Nov 8, 2024 · 576cf49 · 576cf49
1 parent 6ebbb07
commit 576cf49
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -28,13 +28,13 @@ jobs:
       matrix:
         os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
         build_type: [Release]
-        c_compiler: [gcc, clang]
+        c_compiler: [clang]
         include:
           - os: ubuntu-24.04
-            c_compiler: gcc
-            cpp_compiler: g++
-            arm_c_compiler: aarch64-linux-gnu-gcc
-            arm_cpp_compiler: aarch64-linux-gnu-g++
+            c_compiler: gcc-12
+            cpp_compiler: g++-12
+            arm_c_compiler: aarch64-linux-gnu-gcc-12
+            arm_cpp_compiler: aarch64-linux-gnu-g++-12
           - os: ubuntu-24.04
             c_compiler: clang
             cpp_compiler: clang++
@@ -64,13 +64,19 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    
+
     - name: Install cross compiler
-      if: ${{ Contains(matrix.os, 'ubuntu') }}
+      if: ${{ Contains(matrix.os, 'ubuntu-22.04') ||  Contains(matrix.os, 'ubuntu-20.04')}}
       run: |
         sudo apt-get update
         sudo apt-get install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu libstdc++6-arm64-cross linux-libc-dev-arm64-cross
 
+    - name: Install gcc-12
+      if: ${{ Contains(matrix.os, 'ubuntu-24.04') }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y g++-12-aarch64-linux-gnu gcc-12-aarch64-linux-gnu gcc-12 g++-12 g++-aarch64-linux-gnu gcc-aarch64-linux-gnu libstdc++6-arm64-cross linux-libc-dev-arm64-cross
+
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11
       id: runvcpkg

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,14 +6,14 @@ on:
       - 'v*'
 
 jobs:
-  build:
+  build-release:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         include:
           - os: ubuntu-24.04
-            c_compiler: gcc
-            cpp_compiler: g++
+            c_compiler: gcc-12
+            cpp_compiler: g++-12
             arm_c_compiler: aarch64-linux-gnu-gcc
             arm_cpp_compiler: aarch64-linux-gnu-g++
           - os: ubuntu-22.04
@@ -32,11 +32,17 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Install cross compiler
-      if: ${{ Contains(matrix.os, 'ubuntu') }}
+      if: ${{ Contains(matrix.os, 'ubuntu-22.04') ||  Contains(matrix.os, 'ubuntu-20.04')}}
       run: |
         sudo apt-get update
         sudo apt-get install -y g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
 
+    - name: Install gcc-12
+      if: ${{ Contains(matrix.os, 'ubuntu-24.04') }}
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y g++-12-aarch64-linux-gnu gcc-12-aarch64-linux-gnu gcc-12 g++-12 g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
+
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11
       id: runvcpkg