Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Clang 12.0.1 and add Clang 13 #15

Merged
merged 2 commits into from
Oct 19, 2021
Merged

Fix Clang 12.0.1 and add Clang 13 #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747a53b
Workaround if clause not being executed
muttleyxd Oct 18, 2021
9f9cf99
add clang 13
muttleyxd Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/clang-tools-amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}'
Expand Down Expand Up @@ -88,7 +90,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' }}
Copy link
Contributor

@WolleTD WolleTD Nov 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's strange how the string 12.0.1 is apparently neither >= 9 nor < 7 (line 77). I would've expected it to be at least exactly one of those things. Even more so, because 3.9 < 7 actually works.

Edit: Well, 3.9 is a floating point number, 12.0.1 is not, duh. I still wonder what GH actions does there.

shell: bash
run: |
version=${RELEASE##llvm-project-}; version=${version%.src}
Expand All @@ -112,7 +114,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 }}
Expand Down