Skip to content

Commit e0753dd

Browse files
authored
Merge pull request #252 from aminya/ubuntu-24 [skip ci]
2 parents 75540d0 + 7d9eec9 commit e0753dd

File tree

7 files changed

+23
-12
lines changed

7 files changed

+23
-12
lines changed

.github/workflows/CI.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ concurrency:
1515

1616
jobs:
1717
Build:
18-
runs-on: ubuntu-22.04
18+
runs-on: ${{ matrix.os }}
1919
name: Build
2020
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
2121
strategy:
2222
fail-fast: false
2323
matrix:
2424
os:
25-
- ubuntu-22.04
25+
- ubuntu-24.04
2626
node:
2727
- 22
2828
pnpm:
@@ -92,7 +92,7 @@ jobs:
9292
matrix:
9393
os:
9494
- windows-2022
95-
- ubuntu-22.04
95+
- ubuntu-24.04
9696
- macos-13
9797
- macos-12
9898
node:
@@ -156,6 +156,7 @@ jobs:
156156
os:
157157
- windows-2022
158158
- windows-2019
159+
- ubuntu-24.04
159160
- ubuntu-22.04
160161
- ubuntu-20.04
161162
- macos-13
@@ -234,7 +235,7 @@ jobs:
234235
fail-fast: false
235236
matrix:
236237
os:
237-
- ubuntu-22.04
238+
- ubuntu-24.04
238239
node:
239240
- 22
240241
pnpm:
@@ -282,7 +283,7 @@ jobs:
282283
Release:
283284
if: startsWith(github.ref, 'refs/tags/')
284285
needs: [Build, BuildExecutable, Test, Docker]
285-
runs-on: ubuntu-22.04
286+
runs-on: ubuntu-24.04
286287
steps:
287288
- name: Download All Artifacts
288289
uses: actions/download-artifact@v3

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Setting up a **cross-platform** environment for building and testing C++/C proje
88

99
`setup-cpp` can be used locally from terminal, from CI services like GitHub Actions and GitLab Pipelines, and inside containers like Docker.
1010

11-
`setup-cpp` is supported on many platforms. It is continuously tested on several configurations including Windows (11, 10, 2022, 2019), Linux (Ubuntu 22.04, Ubuntu 20.04, Fedora, ArchLinux), and macOS (13, 12, 11, 10.15). `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
11+
`setup-cpp` is supported on many platforms. It is continuously tested on several configurations including Windows (11, 10, 2022, 2019), Linux (Ubuntu 24.0, 22.04, 20.04, 18.04, Fedora, ArchLinux), and macOS (13, 12, 11, 10.15). `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
1212

1313
## Features
1414

@@ -111,7 +111,7 @@ jobs:
111111
matrix:
112112
os:
113113
- windows-2022
114-
- ubuntu-22.04
114+
- ubuntu-24.04
115115
- macos-12
116116
compiler:
117117
- llvm
@@ -259,7 +259,7 @@ jobs:
259259
strategy:
260260
matrix:
261261
os:
262-
- ubuntu-22.04
262+
- ubuntu-24.04
263263
steps:
264264
- uses: actions/checkout@v3
265265
- name: Build

dist/actions/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/versions/default_versions.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,48 +44,57 @@ export const MinVersions: Record<string, string | undefined> = {
4444
// - the older ones use ""
4545
export const DefaultLinuxVersion: Record<string, Record<number, string> | undefined> = {
4646
gcc: {
47+
24: "13",
4748
22: "13",
4849
20: "11",
4950
18: "11",
5051
16: "11",
5152
14: "11",
5253
},
5354
mingw: {
55+
24: "8.0.0-1",
5456
22: "8.0.0-1",
5557
20: "7.0.0-2",
5658
},
5759
// the suffixes relate to the suffix in the llvm releases
5860
llvm: {
61+
24: "17.0.6-ubuntu-22.04",
5962
22: "17.0.6-ubuntu-22.04",
6063
20: "17.0.6-ubuntu-22.04",
6164
18: "15.0.6-ubuntu-18.04",
6265
16: "15.0.6-ubuntu-18.04",
6366
14: "13.0.0-ubuntu-16.04",
6467
},
6568
clangtidy: {
69+
24: "17.0.6-ubuntu-22.04",
6670
22: "17.0.6-ubuntu-22.04",
6771
20: "17.0.6-ubuntu-22.04",
6872
18: "15.0.6-ubuntu-18.04",
6973
16: "15.0.6-ubuntu-18.04",
7074
14: "13.0.0-ubuntu-16.04",
7175
},
7276
clangformat: {
77+
24: "17.0.6-ubuntu-22.04",
7378
22: "17.0.6-ubuntu-22.04",
7479
20: "17.0.6-ubuntu-22.04",
7580
18: "15.0.6-ubuntu-18.04",
7681
16: "15.0.6-ubuntu-18.04",
7782
14: "13.0.0-ubuntu-16.04",
7883
},
7984
gcovr: {
85+
24: "6.0",
8086
22: "6.0",
8187
20: "6.0",
8288
18: "5.0",
8389
},
8490
meson: {
91+
24: "1.0.0",
92+
22: "1.0.0",
8593
20: "1.0.0",
8694
18: "0.61.4",
8795
},
8896
nala: {
97+
24: "",
8998
22: "",
9099
21: "legacy",
91100
20: "legacy",
@@ -94,6 +103,7 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
94103
14: "legacy",
95104
},
96105
kcov: {
106+
24: "42-binary",
97107
22: "42-binary",
98108
20: "40-binary", // https://github.com/SimonKagstrom/kcov/releases
99109
18: "40",

0 commit comments

Comments
 (0)