Skip to content

Commit c9e46c4

Browse files
committed
Use LLVM 13 in CI
1 parent cca6a6b commit c9e46c4

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/documentation.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
- name: Install LLVM
2323
shell: bash
2424
run: |
25-
curl --proto '=https' --tlsv1.2 -sSf ${{ env.LLVM_URL }} -L -o llvm.tar.gz
25+
curl --proto '=https' --tlsv1.2 -sSf ${{ env.LLVM_URL }} -L -o llvm.tar.xz
2626
mkdir ${{ env.LLVM_DIR }}
27-
tar xf llvm.tar.gz --strip-components=1 -C ${{ env.LLVM_DIR }}
27+
tar xf llvm.tar.xz --strip-components=1 -C ${{ env.LLVM_DIR }}
2828
echo "${{ env.LLVM_DIR }}/bin" >> $GITHUB_PATH
2929
echo "LLVM_SYS_120_PREFIX=${{ env.LLVM_DIR }}" >> $GITHUB_ENV
3030
env:
31-
LLVM_DIR: ${{ github.workspace }}/llvm-12
32-
LLVM_URL: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/12.x/linux-amd64.tar.gz'
31+
LLVM_DIR: ${{ github.workspace }}/llvm-13
32+
LLVM_URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz'
3333
- name: Build & package documentation
3434
run: make package-docs
3535
- name: Publish documentation

.github/workflows/lint.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
components: rustfmt, clippy
2424
- name: Install LLVM (Linux)
2525
run: |
26-
curl --proto '=https' --tlsv1.2 -sSf https://github.com/wasmerio/llvm-custom-builds/releases/download/12.x/linux-amd64.tar.gz -L -o /opt/llvm.tar.gz
26+
curl --proto '=https' --tlsv1.2 -sSf https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz -L -o /opt/llvm.tar.xz
2727
mkdir -p /opt/llvm-12
28-
tar xf /opt/llvm.tar.gz --strip-components=1 -C /opt/llvm-12
28+
tar xf /opt/llvm.tar.xz --strip-components=1 -C /opt/llvm-12
2929
echo '/opt/llvm-12/bin' >> $GITHUB_PATH
3030
echo 'LLVM_SYS_120_PREFIX=/opt/llvm-12' >> $GITHUB_ENV
3131
- run: make lint

.github/workflows/test-sys.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
include:
4343
- build: linux-x64
4444
os: ubuntu-18.04
45-
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/12.x/linux-amd64.tar.gz'
45+
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz'
4646
artifact_name: 'wasmer-linux-amd64'
4747
cross_compilation_artifact_name: 'cross_compiled_from_linux'
4848
run_test: true
@@ -51,7 +51,7 @@ jobs:
5151
use_sccache: true
5252
- build: macos-x64
5353
os: macos-11
54-
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/12.x/darwin-amd64.tar.gz'
54+
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-apple-darwin.tar.xz'
5555
artifact_name: 'wasmer-darwin-amd64'
5656
cross_compilation_artifact_name: 'cross_compiled_from_mac'
5757
run_test: true
@@ -69,7 +69,7 @@ jobs:
6969
- build: windows-x64
7070
os: windows-latest
7171
# llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/12.x/windows-amd64.tar.gz'
72-
llvm_choco_version: 12.0.1
72+
llvm_choco_version: 13.0.0
7373
artifact_name: 'wasmer-windows-amd64'
7474
cross_compilation_artifact_name: 'cross_compiled_from_win'
7575
run_integration_tests: true
@@ -131,10 +131,10 @@ jobs:
131131
if: matrix.llvm_url
132132
shell: bash
133133
run: |
134-
curl --proto '=https' --tlsv1.2 -sSf ${{ matrix.llvm_url }} -L -o llvm.tar.gz
134+
curl --proto '=https' --tlsv1.2 -sSf ${{ matrix.llvm_url }} -L -o llvm.tar.xz
135135
LLVM_DIR=$(pwd)/${{ env.LLVM_DIR }}
136136
mkdir ${LLVM_DIR}
137-
tar xf llvm.tar.gz --strip-components=1 -C ${LLVM_DIR}
137+
tar xf llvm.tar.xz --strip-components=1 -C ${LLVM_DIR}
138138
echo "${LLVM_DIR}/bin" >> $GITHUB_PATH
139139
echo "LLVM_SYS_120_PREFIX=${LLVM_DIR}" >> $GITHUB_ENV
140140
env:

0 commit comments

Comments
 (0)