map version 4 to 4.0
This commit is contained in:
parent
3b362febbf
commit
f553c1487d
4 changed files with 15 additions and 7 deletions
7
.github/actions/build-foo/action.yml
vendored
7
.github/actions/build-foo/action.yml
vendored
|
@ -1,9 +1,10 @@
|
||||||
name: Build foo.exe
|
name: Build foo.exe
|
||||||
description: Build foo.exe
|
description: Build foo.exe
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
binary:
|
||||||
description: Version to use
|
description: Compiler binary file name
|
||||||
required: false
|
required: false
|
||||||
|
default: clang++
|
||||||
platform:
|
platform:
|
||||||
description: Target platform
|
description: Target platform
|
||||||
required: true
|
required: true
|
||||||
|
@ -23,5 +24,5 @@ runs:
|
||||||
$flags += '-lpthread'
|
$flags += '-lpthread'
|
||||||
}
|
}
|
||||||
|
|
||||||
& "clang++$version" $flags
|
& '${{ inputs.binary }}' $flags
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
|
|
5
.github/workflows/test.yml
vendored
5
.github/workflows/test.yml
vendored
|
@ -50,7 +50,8 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
- name: Set up Clang
|
- id: setup
|
||||||
|
name: Set up Clang
|
||||||
uses: ./
|
uses: ./
|
||||||
with:
|
with:
|
||||||
version: '${{ matrix.version }}'
|
version: '${{ matrix.version }}'
|
||||||
|
@ -59,7 +60,7 @@ jobs:
|
||||||
- name: Build foo.exe
|
- name: Build foo.exe
|
||||||
uses: ./.github/actions/build-foo
|
uses: ./.github/actions/build-foo
|
||||||
with:
|
with:
|
||||||
version: '${{ matrix.version }}'
|
binary: '${{ steps.setup.outputs.clangxx }}'
|
||||||
- name: Run foo.exe
|
- name: Run foo.exe
|
||||||
uses: ./.github/actions/run-foo
|
uses: ./.github/actions/run-foo
|
||||||
- name: Check cc/c++
|
- name: Check cc/c++
|
||||||
|
|
|
@ -44,6 +44,11 @@ API
|
||||||
| hardlinks | *any* | ✓ | Cygwin: don't convert any symlinks.
|
| hardlinks | *any* | ✓ | Cygwin: don't convert any symlinks.
|
||||||
| | 1 | | Cygwin: convert symlinks in /usr/bin to hardlinks.
|
| | 1 | | Cygwin: convert symlinks in /usr/bin to hardlinks.
|
||||||
|
|
||||||
|
| Output | Example | Description
|
||||||
|
| ------- | --------- | -----------
|
||||||
|
| clang | clang-4.0 | clang compiler binary file name
|
||||||
|
| clangxx | clang++-7 | clang++ compiler binary file name
|
||||||
|
|
||||||
Supported versions
|
Supported versions
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|
|
@ -92,8 +92,9 @@ runs:
|
||||||
|
|
||||||
switch -Exact ($Version) {
|
switch -Exact ($Version) {
|
||||||
# Since version 7, they dropped the .0 suffix. The earliest
|
# Since version 7, they dropped the .0 suffix. The earliest
|
||||||
# version supported is 5.0 on Bionic; versions 5 and 6 are
|
# version supported is 3.9 on Bionic; versions 4, 5 and 6 are
|
||||||
# mapped to LLVM-friendly 5.0 and 6.0.
|
# mapped to LLVM-friendly 4.0, 5.0 and 6.0.
|
||||||
|
'4' { '4.0' }
|
||||||
'5' { '5.0' }
|
'5' { '5.0' }
|
||||||
'6' { '6.0' }
|
'6' { '6.0' }
|
||||||
default { $Version }
|
default { $Version }
|
||||||
|
|
Loading…
Add table
Reference in a new issue