Skip to content

Commit 6d90f69

Browse files
florianbeckerflorianbecker
committed
Upgrade codeql workflows
1 parent 90bd81f commit 6d90f69

File tree

3 files changed

+101
-71
lines changed

3 files changed

+101
-71
lines changed

‎.github/workflows/linux-codeql.yml‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,20 @@ 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,
2528
ubuntu-22.04-clang-11,
2629
ubuntu-22.04-clang-12,
2730
ubuntu-22.04-clang-13,
2831
ubuntu-22.04-clang-14,
29-
ubuntu-22.04-clang-15
32+
ubuntu-22.04-clang-15,
33+
ubuntu-24.04-clang-16,
34+
ubuntu-24.04-clang-17,
35+
ubuntu-24.04-clang-18
3036
]
3137
config: [Debug, Release]
3238
include:
@@ -50,6 +56,21 @@ jobs:
5056
compiler: gcc
5157
version: 12
5258

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+
5374
- name: ubuntu-20.04-clang-8
5475
os: ubuntu-20.04
5576
compiler: clang
@@ -90,20 +111,30 @@ jobs:
90111
compiler: clang
91112
version: 15
92113

114+
- name: ubuntu-24.04-clang-16
115+
os: ubuntu-24.04
116+
compiler: clang
117+
version: 16
118+
119+
- name: ubuntu-24.04-clang-17
120+
os: ubuntu-24.04
121+
compiler: clang
122+
version: 17
123+
124+
- name: ubuntu-24.04-clang-18
125+
os: ubuntu-24.04
126+
compiler: clang
127+
version: 18
128+
93129
steps:
94-
- uses: actions/checkout@v3
130+
- uses: actions/checkout@v4
95131

96132
- name: Dependencies
97133
run: |
98-
if [ "${{matrix.version}}" = "15" ]; then
99-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|gpg --dearmor > llvm-snapshot.gpg
100-
sudo mv llvm-snapshot.gpg /etc/apt/trusted.gpg.d/
101-
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
102-
fi
103-
104134
sudo apt update
105135
sudo apt install -y ninja-build
106136
sudo apt install -y doxygen graphviz
137+
sudo apt install -y libx11-dev
107138
if [ "${{matrix.os}}" = "ubuntu-20.04" ]; then
108139
sudo apt install -y qtbase5-dev
109140
else

‎.github/workflows/macos-codeql.yml‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,32 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
name: [
18-
macos-12-xcode-13-x86_64,
19-
# macos-12-xcode-13-arm64,
20-
macos-12-xcode-14-x86_64
21-
# macos-12-xcode-14-arm64
18+
macos-13-xcode-14-x86_64,
19+
macos-13-xcode-15-x86_64,
20+
macos-14-xcode-16-arm64
2221
]
2322
config: [Debug, Release]
2423
include:
25-
- name: macos-12-xcode-13-x86_64
26-
os: macos-12
24+
- name: macos-13-xcode-14-x86_64
25+
os: macos-13
2726
compiler: xcode
28-
version: "13.4"
27+
version: "14.3"
2928
architecture: x86_64
3029

31-
# - name: macos-12-xcode-13-arm64
32-
# os: macos-12
33-
# compiler: xcode
34-
# version: "13.4"
35-
# architecture: arm64
36-
37-
- name: macos-12-xcode-14-x86_64
38-
os: macos-12
30+
- name: macos-13-xcode-15-x86_64
31+
os: macos-13
3932
compiler: xcode
40-
version: "14.2"
33+
version: "15.2"
4134
architecture: x86_64
4235

43-
# - name: macos-12-xcode-14-arm64
44-
# os: macos-12
45-
# compiler: xcode
46-
# version: "14.2"
47-
# architecture: arm64
36+
- name: macos-14-xcode-16-arm64
37+
os: macos-14
38+
compiler: xcode
39+
version: "15.4"
40+
architecture: arm64
4841

4942
steps:
50-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
5144

5245
- name: Dependencies
5346
run: |

‎.github/workflows/windows-codeql.yml‎

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ jobs:
88
name: ${{matrix.name}} (${{matrix.config}})
99
runs-on: ${{matrix.os}}
1010

11+
env:
12+
CMAKE_GENERATOR: Ninja
13+
1114
strategy:
1215
fail-fast: false
1316
matrix:
@@ -26,95 +29,98 @@ jobs:
2629
- name: windows-2019-msvc2019
2730
os: windows-2019
2831
compiler: cl
29-
version: Visual Studio 16 2019
30-
architecture: -A x64
31-
version2: win64_msvc2019_64
32-
qtversion: 6.4.2
32+
architecture: x64
33+
complete: win64_msvc2019_64
34+
qtversion: "6.5.3"
3335

3436
- name: windows-2019-msvc2019-win32
3537
os: windows-2019
3638
compiler: cl
37-
version: Visual Studio 16 2019
38-
architecture: -A Win32
39-
version2: win32_msvc2019
40-
qtversion: 5.15.2
39+
architecture: x86
40+
complete: win32_msvc2019
41+
qtversion: "5.15.2"
4142

4243
- name: windows-2019-msvc2019-arm64
4344
os: windows-2019
4445
compiler: cl
45-
version: Visual Studio 16 2019
46-
architecture: -A ARM64
47-
version2: win64_msvc2019_arm64
48-
qtversion: 6.4.2
46+
architecture: x64_arm64
47+
complete: win64_msvc2019_arm64
48+
qtversion: "6.5.3"
4949

5050
- name: windows-2019-msvc2019-clang
5151
os: windows-2019
5252
compiler: clang-cl
53-
version: Visual Studio 16 2019
54-
architecture: -A x64
55-
toolchain: -T ClangCl
56-
version2: win64_msvc2019_64
57-
qtversion: 6.4.2
53+
architecture: x64
54+
complete: win64_msvc2019_64
55+
qtversion: "6.5.3"
5856

5957
- name: windows-2022-msvc2022
6058
os: windows-2022
6159
compiler: cl
62-
version: Visual Studio 17 2022
63-
architecture: -A x64
64-
version2: win64_msvc2019_64
65-
qtversion: 6.4.2
60+
architecture: x64
61+
complete: win64_msvc2019_64
62+
qtversion: "6.5.3"
6663

6764
- name: windows-2022-msvc2022-win32
6865
os: windows-2022
6966
compiler: cl
70-
version: Visual Studio 17 2022
71-
architecture: -A Win32
72-
version2: win32_msvc2019
73-
qtversion: 5.15.2
67+
architecture: x86
68+
complete: win32_msvc2019
69+
qtversion: "5.15.2"
7470

7571
- name: windows-2022-msvc2022-arm64
7672
os: windows-2022
7773
compiler: cl
78-
version: Visual Studio 17 2022
79-
architecture: -A ARM64
80-
version2: win64_msvc2019_arm64
81-
qtversion: 6.4.2
74+
architecture: x64_arm64
75+
complete: win64_msvc2019_arm64
76+
qtversion: "6.5.3"
8277

8378
- name: windows-2022-msvc2022-clang
8479
os: windows-2022
8580
compiler: clang-cl
86-
version: Visual Studio 17 2022
87-
architecture: -A x64
88-
toolchain: -T ClangCl
89-
version2: win64_msvc2019_64
90-
qtversion: 6.4.2
81+
architecture: x64
82+
complete: win64_msvc2019_64
83+
qtversion: "6.5.3"
9184

9285
steps:
93-
- uses: actions/checkout@v3
86+
- uses: actions/checkout@v4
87+
- uses: ilammy/msvc-dev-cmd@v1
88+
with:
89+
arch: ${{matrix.architecture}}
9490

9591
- name: Install Qt
96-
uses: jurplel/install-qt-action@v3
92+
uses: jurplel/install-qt-action@v4
9793
with:
9894
version: '${{matrix.qtversion}}'
9995
host: 'windows'
10096
target: 'desktop'
101-
arch: '${{matrix.version2}}'
97+
arch: '${{matrix.complete}}'
10298
cache: 'true'
10399

104100
- name: Install Qt (Host)
105-
if: matrix.architecture == '-A ARM64'
106-
uses: jurplel/install-qt-action@v3
101+
if: matrix.architecture == 'x64_arm64'
102+
uses: jurplel/install-qt-action@v4
107103
with:
108104
version: '${{matrix.qtversion}}'
109105
host: 'windows'
110106
target: 'desktop'
111107
arch: 'win64_msvc2019_64'
112108
cache: 'true'
113109

110+
- name: Cache Dependencies
111+
id: cache-choco
112+
uses: actions/cache@v4
113+
env:
114+
cache-name: cache-choco-packages
115+
with:
116+
path: C:/Users/runneradmin/AppData/Local/Temp/chocolatey
117+
key: ${{env.cache-name}}
118+
114119
- name: Dependencies
115120
run: |
121+
choco install ninja -y
116122
choco install doxygen.install graphviz -y
117-
if ( "${{matrix.architecture}}" -eq "-A ARM64" ) {
123+
if ( "${{matrix.architecture}}" -eq "x64_arm64" ) {
118124
echo "Qt6_DIR=${{runner.workspace}}/Qt/${{matrix.qtversion}}/msvc2019_arm64" >> $env:GITHUB_ENV
119125
echo "QT_PLUGIN_PATH=${{runner.workspace}}/Qt/${{matrix.qtversion}}/msvc2019_arm64/plugins" >> $env:GITHUB_ENV
120126
echo "QML2_IMPORT_PATH=${{runner.workspace}}/Qt/${{matrix.qtversion}}/msvc2019_arm64/qml" >> $env:GITHUB_ENV
@@ -132,7 +138,7 @@ jobs:
132138

133139
- name: Configure CMake
134140
working-directory: ${{runner.workspace}}/build
135-
run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE:STRING=${{matrix.config}} -G"${{matrix.version}}" ${{matrix.architecture}} ${{matrix.toolchain}}
141+
run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE:STRING=${{matrix.config}}
136142

137143
- name: Build
138144
working-directory: ${{runner.workspace}}/build

0 commit comments

Comments
 (0)