From 747a53bd92f0c03d9de2414617ee0566d75d52b5 Mon Sep 17 00:00:00 2001 From: "Mateusz Szychowski (Muttley)" Date: Mon, 18 Oct 2021 20:31:59 +0200 Subject: [PATCH 1/2] Workaround if clause not being executed GitHub Actions is not able to compare version string (ex. '12.0.1') to an integer value. Another way to fix this would be extracting major version from version string. --- .github/workflows/clang-tools-amd64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clang-tools-amd64.yml b/.github/workflows/clang-tools-amd64.yml index a4d319d..00131fa 100644 --- a/.github/workflows/clang-tools-amd64.yml +++ b/.github/workflows/clang-tools-amd64.yml @@ -88,7 +88,7 @@ jobs: curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/cfe-${version}.src.tar.xz curl -LO https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-tools-extra-${version}.src.tar.xz - name: get llvm-project - if: ${{ matrix.clang-version >= 9 }} + if: ${{ matrix.clang-version >= 9 || matrix.clang-version == '12.0.1' }} shell: bash run: | version=${RELEASE##llvm-project-}; version=${version%.src} @@ -112,7 +112,7 @@ jobs: mv ${{ matrix.release }}/clang ${{ matrix.release }}/llvm/tools/clang mv ${{ matrix.release }}/clang-tools-extra ${{ matrix.release }}/llvm/tools/clang/tools/extra - name: unpack llvm-project - if: ${{ matrix.clang-version >= 9 }} + if: ${{ matrix.clang-version >= 9 || matrix.clang-version == '12.0.1' }} shell: bash run: | tar xf ${{ matrix.release }}.tar.xz ${{ matrix.extra-tar-args }} From 9f9cf995ce47802186899513dfabcc10934852bf Mon Sep 17 00:00:00 2001 From: "Mateusz Szychowski (Muttley)" Date: Tue, 19 Oct 2021 13:06:07 +0200 Subject: [PATCH 2/2] add clang 13 --- .github/workflows/clang-tools-amd64.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/clang-tools-amd64.yml b/.github/workflows/clang-tools-amd64.yml index 00131fa..8fbad06 100644 --- a/.github/workflows/clang-tools-amd64.yml +++ b/.github/workflows/clang-tools-amd64.yml @@ -8,7 +8,7 @@ jobs: build: strategy: matrix: - clang-version: [ 3.9, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12.0.1 ] + clang-version: [ 3.9, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12.0.1, 13 ] os: [ linux, macosx, windows ] include: - clang-version: 3.9 @@ -36,6 +36,8 @@ jobs: release: llvm-project-12.0.0.src - clang-version: 12.0.1 release: llvm-project-12.0.1.src + - clang-version: 13 + release: llvm-project-13.0.0.src - os: linux runner: ubuntu-20.04 os-cmake-args: '-DLLVM_BUILD_STATIC=ON -DCMAKE_CXX_FLAGS="-s -flto" ${POSIX_CMAKE_ARGS}'