Merge pull request #286 from Integral-Tech/update-ci

CI: Update Ubuntu, gcc & clang-format
sysprog21 · Nov 12, 2024 · 6e3aee6 · 6e3aee6
2 parents 885da47 + 2c29aef
commit 6e3aee6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.ci/check-format.sh b/.ci/check-format.sh
@@ -2,7 +2,7 @@
 
 SOURCES=$(find $(git rev-parse --show-toplevel) | grep -E "\.(cpp|cc|c|h)\$")
 
-CLANG_FORMAT=$(which clang-format-12)
+CLANG_FORMAT=$(which clang-format)
 if [ $? -ne 0 ]; then
     CLANG_FORMAT=$(which clang-format)
     if [ $? -ne 0 ]; then

diff --git a/.ci/static-analysis.sh b/.ci/static-analysis.sh
@@ -62,9 +62,9 @@ function do_sparse()
 
 function do_gcc()
 {
-    local GCC=$(which gcc-11)
+    local GCC=$(which gcc)
     if [ $? -ne 0 ]; then
-        echo "[!] gcc-11 is not installed. Failed to run static analysis with GCC." >&2
+        echo "[!] gcc is not installed. Failed to run static analysis with GCC." >&2
         exit 1
     fi
 

diff --git a/.github/workflows/status-check.yaml b/.github/workflows/status-check.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   validate:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout code
         uses: actions/checkout@v4
@@ -23,9 +23,7 @@ jobs:
         if: ${{ steps.changed-files.outputs.any_changed == 'true' ||
                 github.event_name == 'workflow_dispatch' }}
         run: |
-            sudo apt-get install -q -y clang-format-12
-            sudo apt-get install -q -y cppcheck
-            sudo apt-get install -q -y gcc-11
+            sudo apt install -q -y clang-format cppcheck gcc
             .ci/check-newline.sh
             .ci/check-format.sh
             .ci/static-analysis.sh