Skip to content

Commit 6e3aee6

Browse files
authored
Merge pull request #286 from Integral-Tech/update-ci
CI: Update Ubuntu, gcc & clang-format
2 parents 885da47 + 2c29aef commit 6e3aee6

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.ci/check-format.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
SOURCES=$(find $(git rev-parse --show-toplevel) | grep -E "\.(cpp|cc|c|h)\$")
44

5-
CLANG_FORMAT=$(which clang-format-12)
5+
CLANG_FORMAT=$(which clang-format)
66
if [ $? -ne 0 ]; then
77
CLANG_FORMAT=$(which clang-format)
88
if [ $? -ne 0 ]; then

.ci/static-analysis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ function do_sparse()
6262

6363
function do_gcc()
6464
{
65-
local GCC=$(which gcc-11)
65+
local GCC=$(which gcc)
6666
if [ $? -ne 0 ]; then
67-
echo "[!] gcc-11 is not installed. Failed to run static analysis with GCC." >&2
67+
echo "[!] gcc is not installed. Failed to run static analysis with GCC." >&2
6868
exit 1
6969
fi
7070

.github/workflows/status-check.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
validate:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: checkout code
1616
uses: actions/checkout@v4
@@ -23,9 +23,7 @@ jobs:
2323
if: ${{ steps.changed-files.outputs.any_changed == 'true' ||
2424
github.event_name == 'workflow_dispatch' }}
2525
run: |
26-
sudo apt-get install -q -y clang-format-12
27-
sudo apt-get install -q -y cppcheck
28-
sudo apt-get install -q -y gcc-11
26+
sudo apt install -q -y clang-format cppcheck gcc
2927
.ci/check-newline.sh
3028
.ci/check-format.sh
3129
.ci/static-analysis.sh

0 commit comments

Comments
 (0)