From bbe81e2da0986c4d563914ff42d973c99008ad72 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 21 Aug 2021 19:11:01 +0300 Subject: version 13 has been released --- .github/workflows/test.yml | 2 +- README.md | 3 ++- action.yml | 14 +++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index feda01d..6ead135 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: strategy: matrix: 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: - {os: ubuntu-20.04, version: '3.9'} - {os: ubuntu-20.04, version: '4.0'} diff --git a/README.md b/README.md index 6656a67..c1c9135 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The `version` parameter value is not checked for being an available version for the current distribution. The supported versions for a particular distribution are those found in that 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. | `version` | Bionic | Focal @@ -76,6 +76,7 @@ listed below. | 10 | ✓ | ✓ | 11 | ✓ | ✓ | 12 | ✓ | ✓ +| 13 | ✓ | ✓ This table is not definitive; I expect more future versions to be made available, especially for Focal. diff --git a/action.yml b/action.yml index 9565ab1..0bc9fc3 100644 --- a/action.yml +++ b/action.yml @@ -146,6 +146,7 @@ runs: $pkg_clang = 'clang' $pkg_llvm = 'llvm' $pkg_gxx = 'g++' + $additional_deps = @() if (!$latest) { $pkg_version = Format-UpstreamVersion $version @@ -156,12 +157,23 @@ runs: $clang = "$clang-$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) { $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) { if (!$x64) { echo @' -- cgit v1.2.3