Skip to content

Commit 045f4c5

Browse files
aminyaaminya
committed
chore(release): v1.3.0 [skip test]
1 parent 2fe3219 commit 045f4c5

File tree

8 files changed

+97
-49
lines changed

8 files changed

+97
-49
lines changed

‎.github/workflows/CI.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,21 +239,21 @@ jobs:
239239
platform:
240240
- linux/amd64
241241
container:
242-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "24.04", tag: "24.04-1.2.2" }
243-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "22.04", tag: "22.04-1.2.2" }
244-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "20.04", tag: "20.04-1.2.2" }
245-
- { distro: "fedora", image: "setup-cpp-fedora", tag: "40-1.2.2" }
246-
- { distro: "arch", image: "setup-cpp-arch", tag: "base-1.2.2" }
242+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "24.04", tag: "24.04-1.3.0" }
243+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "22.04", tag: "22.04-1.3.0" }
244+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "20.04", tag: "20.04-1.3.0" }
245+
- { distro: "fedora", image: "setup-cpp-fedora", tag: "40-1.3.0" }
246+
- { distro: "arch", image: "setup-cpp-arch", tag: "base-1.3.0" }
247247
include:
248248
- os: ubuntu-24.04-arm
249249
platform: linux/arm64
250-
container: { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "24.04", tag: "24.04-1.2.2" }
250+
container: { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "24.04", tag: "24.04-1.3.0" }
251251
- os: ubuntu-24.04-arm
252252
platform: linux/arm64
253-
container: { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "22.04", tag: "22.04-1.2.2" }
253+
container: { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "22.04", tag: "22.04-1.3.0" }
254254
- os: ubuntu-24.04-arm
255255
platform: linux/arm64
256-
container: { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "20.04", tag: "20.04-1.2.2" }
256+
container: { distro: "ubuntu", image: "setup-cpp-ubuntu", BASE_VERSION: "20.04", tag: "20.04-1.3.0" }
257257
steps:
258258
- uses: actions/checkout@v4
259259
with:
@@ -445,10 +445,10 @@ jobs:
445445
fail-fast: false
446446
matrix:
447447
container:
448-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.2.2", suffix: "", latest: true }
449-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.2.2", suffix: "-llvm", latest: true }
450-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.2.2", suffix: "-gcc", latest: true }
451-
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.2.2", suffix: "-mingw", latest: true }
448+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.3.0", suffix: "", latest: true }
449+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.3.0", suffix: "-llvm", latest: true }
450+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.3.0", suffix: "-gcc", latest: true }
451+
- { distro: "ubuntu", image: "setup-cpp-ubuntu", tag: "22.04-1.3.0", suffix: "-mingw", latest: true }
452452
steps:
453453
- name: Set up Docker Buildx
454454
uses: docker/setup-buildx-action@v3

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21...3.28)
22

33
project(
44
setup_cpp_tests
5-
VERSION 1.2.2
5+
VERSION 1.3.0
66
DESCRIPTION "Tests for setup-cpp"
77
HOMEPAGE_URL "https://github.com/aminya/setup-cpp"
88
LANGUAGES CXX C)

‎README.md

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -211,88 +211,108 @@ To provide fast development environments, `setup-cpp` provides several prebuilt
211211

212212
The names are in the format `aminya/setup-cpp-<platform>:<platform_version>-<setup_cpp_version>` and `aminya/setup-cpp-<platform>-<compiler>:<platform_version>-<setup_cpp_version>`.
213213

214-
#### Ubuntu Images
214+
#### Ubuntu Images (amd64 and arm64)
215215

216-
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang`
216+
Setup-cpp provides prebuilt images for various Ubuntu versions (20.04, 22.04, 24.04) with support for base tools, and compilers `llvm`, `gcc`, and `mingw` available for `amd64` and `arm64` architectures.
217+
218+
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang` for Ubuntu 24.04:
217219

218220
```dockerfile
219-
FROM aminya/setup-cpp-ubuntu:22.04-1.2.2 AS builder
221+
FROM aminya/setup-cpp-ubuntu:24.04-1.3.0 AS builder
220222
```
221223

222224
Image with `llvm` and the base tools:
223225

224226
```dockerfile
225-
FROM aminya/setup-cpp-ubuntu-llvm:22.04-1.2.2 AS builder
227+
FROM aminya/setup-cpp-ubuntu-llvm:24.04-1.3.0 AS builder
226228
```
227229

228230
Image with `gcc` and the base tools:
229231

230232
```dockerfile
231-
FROM aminya/setup-cpp-ubuntu-gcc:22.04-1.2.2 AS builder
233+
FROM aminya/setup-cpp-ubuntu-gcc:24.04-1.3.0 AS builder
232234
```
233235

234236
Image with `mingw` and the base tools:
235237

236238
```dockerfile
237-
FROM aminya/setup-cpp-ubuntu-mingw:22.04-1.2.2 AS builder
239+
FROM aminya/setup-cpp-ubuntu-mingw:24.04-1.3.0 AS builder
240+
```
241+
242+
There are also the variants for Ubuntu `22.04`
243+
244+
```dockerfile
245+
FROM aminya/setup-cpp-ubuntu:22.04-1.3.0 AS builder
246+
FROM aminya/setup-cpp-ubuntu-llvm:22.04-1.3.0 AS builder
247+
FROM aminya/setup-cpp-ubuntu-gcc:22.04-1.3.0 AS builder
248+
FROM aminya/setup-cpp-ubuntu-mingw:22.04-1.3.0 AS builder
249+
```
250+
251+
And for Ubuntu `20.04`:
252+
253+
```dockerfile
254+
FROM aminya/setup-cpp-ubuntu:20.04-1.3.0 AS builder
255+
FROM aminya/setup-cpp-ubuntu-llvm:20.04-1.3.0 AS builder
256+
FROM aminya/setup-cpp-ubuntu-gcc:20.04-1.3.0 AS builder
257+
FROM aminya/setup-cpp-ubuntu-mingw:20.04-1.3.0 AS builder
238258
```
239259

240-
#### Fedora Images
260+
#### Fedora Images (amd64)
241261

242262
<details>
243263

244264
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang`
245265

246266
```dockerfile
247-
FROM aminya/setup-cpp-fedora:40-1.2.2 AS builder
267+
FROM aminya/setup-cpp-fedora:40-1.3.0 AS builder
248268
```
249269

250270
Image with `llvm` and the base tools:
251271

252272
```dockerfile
253-
FROM aminya/setup-cpp-fedora-llvm:40-1.2.2 AS builder
273+
FROM aminya/setup-cpp-fedora-llvm:40-1.3.0 AS builder
254274
```
255275

256276
Image with `gcc` and the base tools:
257277

258278
```dockerfile
259-
FROM aminya/setup-cpp-fedora-gcc:40-1.2.2 AS builder
279+
FROM aminya/setup-cpp-fedora-gcc:40-1.3.0 AS builder
260280
```
261281

262282
Image with `mingw` and the base tools:
263283

264284
```dockerfile
265-
FROM aminya/setup-cpp-fedora-mingw:40-1.2.2 AS builder
285+
FROM aminya/setup-cpp-fedora-mingw:40-1.3.0 AS builder
266286
```
267287

268288
</details>
269289

270-
#### ArchLinux Images
290+
#### ArchLinux Images (amd64)
271291

272292
<details>
273293

274294
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang`
275295

276296
```dockerfile
277-
FROM aminya/setup-cpp-arch:base-1.2.2 AS builder
297+
FROM aminya/setup-cpp-arch:base-1.3.0 AS builder
278298
```
279299

280300
Image with `llvm` and the base tools:
281301

282302
```dockerfile
283-
FROM aminya/setup-cpp-arch-llvm:base-1.2.2 AS builder
303+
FROM aminya/setup-cpp-arch-llvm:base-1.3.0 AS builder
284304
```
285305

286306
Image with `gcc` and the base tools:
287307

288308
```dockerfile
289-
FROM aminya/setup-cpp-arch-gcc:base-1.2.2 AS builder
309+
FROM aminya/setup-cpp-arch-gcc:base-1.3.0 AS builder
290310
```
291311

292312
Image with `mingw` and the base tools:
293313

294314
```dockerfile
295-
FROM aminya/setup-cpp-arch-mingw:base-1.2.2 AS builder
315+
FROM aminya/setup-cpp-arch-mingw:base-1.3.0 AS builder
296316
```
297317

298318
</details>

‎README_DOCKER.md

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,80 +18,108 @@ To provide fast development environments, `setup-cpp` provides several prebuilt
1818

1919
The names are in the format `aminya/setup-cpp-<platform>:<platform_version>-<setup_cpp_version>` and `aminya/setup-cpp-<platform>-<compiler>:<platform_version>-<setup_cpp_version>`.
2020

21-
#### Ubuntu Images
21+
#### Ubuntu Images (amd64 and arm64)
2222

23-
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang`
23+
Setup-cpp provides prebuilt images for various Ubuntu versions (20.04, 22.04, 24.04) with support for base tools, and compilers `llvm`, `gcc`, and `mingw` available for `amd64` and `arm64` architectures.
24+
25+
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang` for Ubuntu 24.04:
2426

2527
```dockerfile
26-
FROM aminya/setup-cpp-ubuntu:22.04-1.2.2 AS builder
28+
FROM aminya/setup-cpp-ubuntu:24.04-1.3.0 AS builder
2729
```
2830

2931
Image with `llvm` and the base tools:
3032

3133
```dockerfile
32-
FROM aminya/setup-cpp-ubuntu-llvm:22.04-1.2.2 AS builder
34+
FROM aminya/setup-cpp-ubuntu-llvm:24.04-1.3.0 AS builder
3335
```
3436

3537
Image with `gcc` and the base tools:
3638

3739
```dockerfile
38-
FROM aminya/setup-cpp-ubuntu-gcc:22.04-1.2.2 AS builder
40+
FROM aminya/setup-cpp-ubuntu-gcc:24.04-1.3.0 AS builder
3941
```
4042

4143
Image with `mingw` and the base tools:
4244

4345
```dockerfile
44-
FROM aminya/setup-cpp-ubuntu-mingw:22.04-1.2.2 AS builder
46+
FROM aminya/setup-cpp-ubuntu-mingw:24.04-1.3.0 AS builder
47+
```
48+
49+
There are also the variants for Ubuntu `22.04`
50+
51+
```dockerfile
52+
FROM aminya/setup-cpp-ubuntu:22.04-1.3.0 AS builder
53+
FROM aminya/setup-cpp-ubuntu-llvm:22.04-1.3.0 AS builder
54+
FROM aminya/setup-cpp-ubuntu-gcc:22.04-1.3.0 AS builder
55+
FROM aminya/setup-cpp-ubuntu-mingw:22.04-1.3.0 AS builder
56+
```
57+
58+
And for Ubuntu `20.04`:
59+
60+
```dockerfile
61+
FROM aminya/setup-cpp-ubuntu:20.04-1.3.0 AS builder
62+
FROM aminya/setup-cpp-ubuntu-llvm:20.04-1.3.0 AS builder
63+
FROM aminya/setup-cpp-ubuntu-gcc:20.04-1.3.0 AS builder
64+
FROM aminya/setup-cpp-ubuntu-mingw:20.04-1.3.0 AS builder
4565
```
4666

47-
#### Fedora Images
67+
#### Fedora Images (amd64)
68+
69+
<details>
4870

4971
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang`
5072

5173
```dockerfile
52-
FROM aminya/setup-cpp-fedora:40-1.2.2 AS builder
74+
FROM aminya/setup-cpp-fedora:40-1.3.0 AS builder
5375
```
5476

5577
Image with `llvm` and the base tools:
5678

5779
```dockerfile
58-
FROM aminya/setup-cpp-fedora-llvm:40-1.2.2 AS builder
80+
FROM aminya/setup-cpp-fedora-llvm:40-1.3.0 AS builder
5981
```
6082

6183
Image with `gcc` and the base tools:
6284

6385
```dockerfile
64-
FROM aminya/setup-cpp-fedora-gcc:40-1.2.2 AS builder
86+
FROM aminya/setup-cpp-fedora-gcc:40-1.3.0 AS builder
6587
```
6688

6789
Image with `mingw` and the base tools:
6890

6991
```dockerfile
70-
FROM aminya/setup-cpp-fedora-mingw:40-1.2.2 AS builder
92+
FROM aminya/setup-cpp-fedora-mingw:40-1.3.0 AS builder
7193
```
7294

73-
#### ArchLinux Images
95+
</details>
96+
97+
#### ArchLinux Images (amd64)
98+
99+
<details>
74100

75101
Base image with `cmake, ninja, task, vcpkg, python, make, cppcheck, gcovr, doxygen, ccache, conan, meson, cmakelang`
76102

77103
```dockerfile
78-
FROM aminya/setup-cpp-arch:base-1.2.2 AS builder
104+
FROM aminya/setup-cpp-arch:base-1.3.0 AS builder
79105
```
80106

81107
Image with `llvm` and the base tools:
82108

83109
```dockerfile
84-
FROM aminya/setup-cpp-arch-llvm:base-1.2.2 AS builder
110+
FROM aminya/setup-cpp-arch-llvm:base-1.3.0 AS builder
85111
```
86112

87113
Image with `gcc` and the base tools:
88114

89115
```dockerfile
90-
FROM aminya/setup-cpp-arch-gcc:base-1.2.2 AS builder
116+
FROM aminya/setup-cpp-arch-gcc:base-1.3.0 AS builder
91117
```
92118

93119
Image with `mingw` and the base tools:
94120

95121
```dockerfile
96-
FROM aminya/setup-cpp-arch-mingw:base-1.2.2 AS builder
122+
FROM aminya/setup-cpp-arch-mingw:base-1.3.0 AS builder
97123
```
124+
125+
</details>

‎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/modern/setup-cpp.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎package-version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"name": "setup-cpp",
3-
"version": "1.2.2"
3+
"version": "1.3.0"
44
}

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-cpp",
3-
"version": "1.2.2",
3+
"version": "1.3.0",
44
"description": "Install all the tools required for building and testing C++/C projects.",
55
"repository": "https://github.com/aminya/setup-cpp",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)