Skip to content

Commit 00d401a

Browse files
authored
fix and bump CI (Mrkol#46)
* bump CI - use clang-17 and gcc-14 - return cmake 3.30 for lint * use hacks for cmake * treat failed lint as error
1 parent 4880961 commit 00d401a

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/lint.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ jobs:
3434
with:
3535
apt_packages: 'sudo,wget,libx11-dev,xorg-dev,ca-certificates,gpg'
3636
build_dir: build
37+
install_commands: | # Awful, dirty hacks to get the cmake version we need
38+
(test -f /usr/share/doc/kitware-archive-keyring/copyright || \
39+
wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
40+
| gpg --dearmor - | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null) && \
41+
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ noble main' | \
42+
sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null && \
43+
sudo apt-get update && \
44+
(test -f /usr/share/doc/kitware-archive-keyring/copyright || \
45+
sudo rm /usr/share/keyrings/kitware-archive-keyring.gpg) && \
46+
apt-get -y install kitware-archive-keyring cmake
3747
cmake_command: |
3848
cmake -Bbuild -S. -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DGLFW_BUILD_WAYLAND=off
3949
clang_tidy_checks: '' # Use closest .clang-tidy config, not some weird default
@@ -42,3 +52,7 @@ jobs:
4252
# Upload review results as artifacts, a different workflow posts them
4353
# as comments. This is required due to security stuff.
4454
- uses: ZedThree/clang-tidy-review/upload@v0.21.0
55+
56+
# If there are any comments, fail the check
57+
- if: steps.review.outputs.total_comments > 0
58+
run: exit 1

.github/workflows/linux.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
cxx: [g++-12, clang++-15]
15+
cxx: [g++-14, clang++-17]
1616
build_type: [Debug, RelWithDebInfo, Release]
1717
include:
18-
- cxx: g++-12
19-
install: sudo apt install g++-12
20-
- cxx: clang++-15
18+
- cxx: g++-14
19+
install: sudo apt install g++-14
20+
- cxx: clang++-17
2121
cxxflags: -stdlib=libc++
22-
install: sudo apt install clang-15 libc++-15-dev libc++abi-15-dev
22+
install: sudo apt install clang-17 libc++-17-dev libc++abi-17-dev
2323

2424
steps:
2525
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)