version 13 has been released
This commit is contained in:
parent
ce67c296ea
commit
bbe81e2da0
3 changed files with 16 additions and 3 deletions
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
@ -38,7 +38,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-18.04, ubuntu-20.04]
|
os: [ubuntu-18.04, ubuntu-20.04]
|
||||||
version: ['3.9', '4.0', 4, '5.0', 5, '6.0', 6, 7, 8, 9, 10, 11, 12]
|
version: ['3.9', '4.0', 4, '5.0', 5, '6.0', 6, 7, 8, 9, 10, 11, 12, 13]
|
||||||
exclude:
|
exclude:
|
||||||
- {os: ubuntu-20.04, version: '3.9'}
|
- {os: ubuntu-20.04, version: '3.9'}
|
||||||
- {os: ubuntu-20.04, version: '4.0'}
|
- {os: ubuntu-20.04, version: '4.0'}
|
||||||
|
|
|
@ -61,7 +61,7 @@ The `version` parameter value is not checked for being an available version for
|
||||||
the current distribution.
|
the current distribution.
|
||||||
The supported versions for a particular distribution are those found in that
|
The supported versions for a particular distribution are those found in that
|
||||||
distro's repositories & those in the LLVM repository.
|
distro's repositories & those in the LLVM repository.
|
||||||
For example, the supported versions for Bionic & Focal as of July 2021 are
|
For example, the supported versions for Bionic & Focal as of August 2021 are
|
||||||
listed below.
|
listed below.
|
||||||
|
|
||||||
| `version` | Bionic | Focal
|
| `version` | Bionic | Focal
|
||||||
|
@ -76,6 +76,7 @@ listed below.
|
||||||
| 10 | ✓ | ✓
|
| 10 | ✓ | ✓
|
||||||
| 11 | ✓ | ✓
|
| 11 | ✓ | ✓
|
||||||
| 12 | ✓ | ✓
|
| 12 | ✓ | ✓
|
||||||
|
| 13 | ✓ | ✓
|
||||||
|
|
||||||
This table is not definitive; I expect more future versions to be made
|
This table is not definitive; I expect more future versions to be made
|
||||||
available, especially for Focal.
|
available, especially for Focal.
|
||||||
|
|
14
action.yml
14
action.yml
|
@ -146,6 +146,7 @@ runs:
|
||||||
$pkg_clang = 'clang'
|
$pkg_clang = 'clang'
|
||||||
$pkg_llvm = 'llvm'
|
$pkg_llvm = 'llvm'
|
||||||
$pkg_gxx = 'g++'
|
$pkg_gxx = 'g++'
|
||||||
|
$additional_deps = @()
|
||||||
|
|
||||||
if (!$latest) {
|
if (!$latest) {
|
||||||
$pkg_version = Format-UpstreamVersion $version
|
$pkg_version = Format-UpstreamVersion $version
|
||||||
|
@ -156,12 +157,23 @@ runs:
|
||||||
|
|
||||||
$clang = "$clang-$pkg_version"
|
$clang = "$clang-$pkg_version"
|
||||||
$clangxx = "$clangxx-$pkg_version"
|
$clangxx = "$clangxx-$pkg_version"
|
||||||
|
|
||||||
|
if ($pkg_version -eq '13') {
|
||||||
|
# On both Bionic and Focal, the following error occurs otherwise:
|
||||||
|
#
|
||||||
|
# The following packages have unmet dependencies:
|
||||||
|
# llvm-13 : Depends: libomp5-13 (>= 8) but it is not going to be installed
|
||||||
|
# E: Unable to correct problems, you have held broken packages.
|
||||||
|
$additional_deps += 'libomp5-13'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!$x64) {
|
if (!$x64) {
|
||||||
$pkg_gxx = 'g++-multilib'
|
$pkg_gxx = 'g++-multilib'
|
||||||
}
|
}
|
||||||
|
$packages = $pkg_clang,$pkg_llvm,$pkg_gxx
|
||||||
|
$packages += $additional_deps
|
||||||
|
|
||||||
Install-Package $pkg_clang $pkg_llvm $pkg_gxx
|
Install-Package $packages
|
||||||
} elseif ($cygwin_host) {
|
} elseif ($cygwin_host) {
|
||||||
if (!$x64) {
|
if (!$x64) {
|
||||||
echo @'
|
echo @'
|
||||||
|
|
Loading…
Add table
Reference in a new issue