Skip to content

Commit 799e71d

Browse files
committed
Fix linux codeql workflow
1 parent 51c0b5d commit 799e71d

File tree

1 file changed

+31
-22
lines changed

1 file changed

+31
-22
lines changed

.github/workflows/linux-codeql.yml

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
ubuntu-20.04-gcc-10,
2020
ubuntu-22.04-gcc-11,
2121
ubuntu-22.04-gcc-12,
22+
ubuntu-24.04-gcc-12,
23+
ubuntu-24.04-gcc-13,
24+
ubuntu-24.04-gcc-14,
2225
ubuntu-20.04-clang-8,
2326
ubuntu-20.04-clang-9,
2427
ubuntu-20.04-clang-10,
@@ -27,8 +30,9 @@ jobs:
2730
ubuntu-22.04-clang-13,
2831
ubuntu-22.04-clang-14,
2932
ubuntu-22.04-clang-15,
30-
ubuntu-22.04-clang-16,
31-
ubuntu-22.04-clang-17
33+
ubuntu-24.04-clang-16,
34+
ubuntu-24.04-clang-17,
35+
ubuntu-24.04-clang-18
3236
]
3337
config: [Debug, Release]
3438
include:
@@ -52,6 +56,21 @@ jobs:
5256
compiler: gcc
5357
version: 12
5458

59+
- name: ubuntu-24.04-gcc-12
60+
os: ubuntu-24.04
61+
compiler: gcc
62+
version: 12
63+
64+
- name: ubuntu-24.04-gcc-13
65+
os: ubuntu-24.04
66+
compiler: gcc
67+
version: 13
68+
69+
- name: ubuntu-24.04-gcc-14
70+
os: ubuntu-24.04
71+
compiler: gcc
72+
version: 14
73+
5574
- name: ubuntu-20.04-clang-8
5675
os: ubuntu-20.04
5776
compiler: clang
@@ -92,40 +111,30 @@ jobs:
92111
compiler: clang
93112
version: 15
94113

95-
- name: ubuntu-22.04-clang-16
96-
os: ubuntu-22.04
114+
- name: ubuntu-24.04-clang-16
115+
os: ubuntu-24.04
97116
compiler: clang
98117
version: 16
99118

100-
- name: ubuntu-22.04-clang-17
101-
os: ubuntu-22.04
119+
- name: ubuntu-24.04-clang-17
120+
os: ubuntu-24.04
102121
compiler: clang
103122
version: 17
104123

124+
- name: ubuntu-24.04-clang-18
125+
os: ubuntu-24.04
126+
compiler: clang
127+
version: 18
128+
105129
steps:
106130
- uses: actions/checkout@v4
107131

108132
- name: Dependencies
109133
run: |
110-
if [ "${{matrix.version}}" = "15" ]; then
111-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|gpg --dearmor > llvm-snapshot.gpg
112-
sudo mv llvm-snapshot.gpg /etc/apt/trusted.gpg.d/
113-
sudo apt-add-repository "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
114-
fi
115-
if [ "${{matrix.version}}" = "16" ]; then
116-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|gpg --dearmor > llvm-snapshot.gpg
117-
sudo mv llvm-snapshot.gpg /etc/apt/trusted.gpg.d/
118-
sudo apt-add-repository "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
119-
fi
120-
if [ "${{matrix.version}}" = "17" ]; then
121-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|gpg --dearmor > llvm-snapshot.gpg
122-
sudo mv llvm-snapshot.gpg /etc/apt/trusted.gpg.d/
123-
sudo apt-add-repository "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
124-
fi
125-
126134
sudo apt update
127135
sudo apt install -y ninja-build
128136
sudo apt install -y doxygen graphviz
137+
sudo apt install -y libx11-dev
129138
130139
if [ "${{matrix.compiler}}" = "gcc" ]; then
131140
sudo apt install -y g++-${{matrix.version}}

0 commit comments

Comments
 (0)