Merge branch 'sysprog21:master' into master

m561247 · Nov 6, 2024 · eeadaa5 · eeadaa5
2 parents 3db3bd0 + ce03811
commit eeadaa5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.ci/check-format.sh b/.ci/check-format.sh
@@ -6,7 +6,7 @@ set -x
 
 for file in ${SOURCES};
 do
-    clang-format-14 ${file} > expected-format
+    clang-format-16 ${file} > expected-format
     diff -u -p --label="${file}" --label="expected coding style" ${file} expected-format
 done
-exit $(clang-format-14 --output-replacements-xml ${SOURCES} | grep -E -c "</replacement>")
+exit $(clang-format-16 --output-replacements-xml ${SOURCES} | grep -E -c "</replacement>")
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   lab0-c:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: webfactory/[email protected]
@@ -31,12 +31,12 @@ jobs:
             cat scripts/kirby.raw
 
   coding-style:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: coding convention
       run: |
-            sudo apt-get install -q -y clang-format-14
+            sudo apt-get install -q -y clang-format-16
             .ci/check-newline.sh
             .ci/check-format.sh
       shell: bash