mirror of https://github.com/aminya/setup-cpp
Merge pull request #236 from tchaikov/llvm-18 [skip test]
This commit is contained in:
commit
c930e9c0c7
|
@ -249,7 +249,7 @@ jobs:
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
if: ${{ github.event_name != 'pull_request' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
with:
|
with:
|
||||||
username: ${{ vars.DOCKERHUB_USERNAME }}
|
username: aminya
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
|
@ -258,7 +258,7 @@ jobs:
|
||||||
context: .
|
context: .
|
||||||
file: ./dev/docker/ci/${{ matrix.container.file }}
|
file: ./dev/docker/ci/${{ matrix.container.file }}
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: ${{ vars.DOCKERHUB_USERNAME }}/${{ matrix.container.image }}:${{ matrix.container.tag }},${{ vars.DOCKERHUB_USERNAME }}/${{ matrix.container.image }}:latest
|
tags: aminya/${{ matrix.container.image }}:${{ matrix.container.tag }},aminya/${{ matrix.container.image }}:latest
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
|
@ -266,7 +266,7 @@ jobs:
|
||||||
context: .
|
context: .
|
||||||
file: ./dev/docker/examples/${{ matrix.container.file }}
|
file: ./dev/docker/examples/${{ matrix.container.file }}
|
||||||
push: false
|
push: false
|
||||||
tags: ${{ vars.DOCKERHUB_USERNAME }}/test-${{ matrix.container.image }}:${{ matrix.container.tag }}
|
tags: aminya/test-${{ matrix.container.image }}:${{ matrix.container.tag }}
|
||||||
|
|
||||||
Release:
|
Release:
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -75,6 +75,9 @@ export const VERSIONS: Set<string> = getVersions([
|
||||||
"17.0.4",
|
"17.0.4",
|
||||||
"17.0.5",
|
"17.0.5",
|
||||||
"17.0.6",
|
"17.0.6",
|
||||||
|
"18.1.0",
|
||||||
|
"18.1.1",
|
||||||
|
"18.1.2",
|
||||||
])
|
])
|
||||||
|
|
||||||
/** The LLVM versions that were never released for the Windows platform. */
|
/** The LLVM versions that were never released for the Windows platform. */
|
||||||
|
@ -113,6 +116,9 @@ const DARWIN_MISSING = new Set([
|
||||||
"17.0.4",
|
"17.0.4",
|
||||||
"17.0.5",
|
"17.0.5",
|
||||||
"17.0.6",
|
"17.0.6",
|
||||||
|
"18.1.0",
|
||||||
|
"18.1.1",
|
||||||
|
"18.1.2",
|
||||||
])
|
])
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -9,6 +9,7 @@ function getLLVMDefault() {
|
||||||
return "17.0.6"
|
return "17.0.6"
|
||||||
case "linux":
|
case "linux":
|
||||||
// used for non-ubuntu (Fedora, Arch)
|
// used for non-ubuntu (Fedora, Arch)
|
||||||
|
// the suffixes relate to the suffix in the llvm releases
|
||||||
return "17.0.6-ubuntu-22.04"
|
return "17.0.6-ubuntu-22.04"
|
||||||
case "darwin":
|
case "darwin":
|
||||||
return "15.0.3"
|
return "15.0.3"
|
||||||
|
@ -53,6 +54,7 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
|
||||||
22: "8.0.0-1",
|
22: "8.0.0-1",
|
||||||
20: "7.0.0-2",
|
20: "7.0.0-2",
|
||||||
},
|
},
|
||||||
|
// the suffixes relate to the suffix in the llvm releases
|
||||||
llvm: {
|
llvm: {
|
||||||
22: "17.0.6-ubuntu-22.04",
|
22: "17.0.6-ubuntu-22.04",
|
||||||
20: "17.0.6-ubuntu-22.04",
|
20: "17.0.6-ubuntu-22.04",
|
||||||
|
@ -61,15 +63,15 @@ export const DefaultLinuxVersion: Record<string, Record<number, string> | undefi
|
||||||
14: "13.0.0-ubuntu-16.04",
|
14: "13.0.0-ubuntu-16.04",
|
||||||
},
|
},
|
||||||
clangtidy: {
|
clangtidy: {
|
||||||
22: "17.0.2-ubuntu-22.04",
|
22: "17.0.6-ubuntu-22.04",
|
||||||
20: "17.0.2-ubuntu-22.04",
|
20: "17.0.6-ubuntu-22.04",
|
||||||
18: "15.0.6-ubuntu-18.04",
|
18: "15.0.6-ubuntu-18.04",
|
||||||
16: "15.0.6-ubuntu-18.04",
|
16: "15.0.6-ubuntu-18.04",
|
||||||
14: "13.0.0-ubuntu-16.04",
|
14: "13.0.0-ubuntu-16.04",
|
||||||
},
|
},
|
||||||
clangformat: {
|
clangformat: {
|
||||||
22: "17.0.2-ubuntu-22.04",
|
22: "17.0.6-ubuntu-22.04",
|
||||||
20: "17.0.2-ubuntu-22.04",
|
20: "17.0.6-ubuntu-22.04",
|
||||||
18: "15.0.6-ubuntu-18.04",
|
18: "15.0.6-ubuntu-18.04",
|
||||||
16: "15.0.6-ubuntu-18.04",
|
16: "15.0.6-ubuntu-18.04",
|
||||||
14: "13.0.0-ubuntu-16.04",
|
14: "13.0.0-ubuntu-16.04",
|
||||||
|
|
Loading…
Reference in New Issue