Skip to content

Commit c930e9c

Browse files
authored
Merge pull request #236 from tchaikov/llvm-18 [skip test]
2 parents 3490656 + f2ab88c commit c930e9c

File tree

9 files changed

+21
-13
lines changed

9 files changed

+21
-13
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
uses: docker/login-action@v3
250250
if: ${{ github.event_name != 'pull_request' }}
251251
with:
252-
username: ${{ vars.DOCKERHUB_USERNAME }}
252+
username: aminya
253253
password: ${{ secrets.DOCKERHUB_TOKEN }}
254254

255255
- name: Build and push
@@ -258,15 +258,15 @@ jobs:
258258
context: .
259259
file: ./dev/docker/ci/${{ matrix.container.file }}
260260
push: ${{ github.event_name != 'pull_request' }}
261-
tags: ${{ vars.DOCKERHUB_USERNAME }}/${{ matrix.container.image }}:${{ matrix.container.tag }},${{ vars.DOCKERHUB_USERNAME }}/${{ matrix.container.image }}:latest
261+
tags: aminya/${{ matrix.container.image }}:${{ matrix.container.tag }},aminya/${{ matrix.container.image }}:latest
262262

263263
- name: Test
264264
uses: docker/build-push-action@v5
265265
with:
266266
context: .
267267
file: ./dev/docker/examples/${{ matrix.container.file }}
268268
push: false
269-
tags: ${{ vars.DOCKERHUB_USERNAME }}/test-${{ matrix.container.image }}:${{ matrix.container.tag }}
269+
tags: aminya/test-${{ matrix.container.image }}:${{ matrix.container.tag }}
270270

271271
Release:
272272
if: startsWith(github.ref, 'refs/tags/')

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.

dist/modern/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.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/llvm/llvm_url.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ export const VERSIONS: Set<string> = getVersions([
7575
"17.0.4",
7676
"17.0.5",
7777
"17.0.6",
78+
"18.1.0",
79+
"18.1.1",
80+
"18.1.2",
7881
])
7982

8083
/** The LLVM versions that were never released for the Windows platform. */
@@ -113,6 +116,9 @@ const DARWIN_MISSING = new Set([
113116
"17.0.4",
114117
"17.0.5",
115118
"17.0.6",
119+
"18.1.0",
120+
"18.1.1",
121+
"18.1.2",
116122
])
117123

118124
/**

src/versions/default_versions.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ function getLLVMDefault() {
99
return "17.0.6"
1010
case "linux":
1111
// used for non-ubuntu (Fedora, Arch)
12+
// the suffixes relate to the suffix in the llvm releases
1213
return "17.0.6-ubuntu-22.04"
1314
case "darwin":
1415
return "15.0.3"
@@ -53,6 +54,7 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
5354
22: "8.0.0-1",
5455
20: "7.0.0-2",
5556
},
57+
// the suffixes relate to the suffix in the llvm releases
5658
llvm: {
5759
22: "17.0.6-ubuntu-22.04",
5860
20: "17.0.6-ubuntu-22.04",
@@ -61,15 +63,15 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
6163
14: "13.0.0-ubuntu-16.04",
6264
},
6365
clangtidy: {
64-
22: "17.0.2-ubuntu-22.04",
65-
20: "17.0.2-ubuntu-22.04",
66+
22: "17.0.6-ubuntu-22.04",
67+
20: "17.0.6-ubuntu-22.04",
6668
18: "15.0.6-ubuntu-18.04",
6769
16: "15.0.6-ubuntu-18.04",
6870
14: "13.0.0-ubuntu-16.04",
6971
},
7072
clangformat: {
71-
22: "17.0.2-ubuntu-22.04",
72-
20: "17.0.2-ubuntu-22.04",
73+
22: "17.0.6-ubuntu-22.04",
74+
20: "17.0.6-ubuntu-22.04",
7375
18: "15.0.6-ubuntu-18.04",
7476
16: "15.0.6-ubuntu-18.04",
7577
14: "13.0.0-ubuntu-16.04",

0 commit comments

Comments
 (0)