CI: use llvm 10.0.0 release (#194)

* CI: use llvm 10.0.0 release * ci: download mac over https, add -L flag to curl * llvm 10 is shipping for ubuntu 18.04, which is reasonable * llvm releases are now served from github! 🎉 * oops * one of these days ill get it right * love too program in yml * missed the other spot to convert to 18.04 * mac ci: fix clang_dir
WebAssembly · Apr 6, 2020 · 86550c3 · 86550c3 · weijianjiewjj · Aug 5, 2020
1 parent 1792d02
commit 86550c3
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,8 +16,8 @@ jobs:
     - name: Install clang (Windows)
       shell: bash
       run: |
-          curl -fsSLO https://releases.llvm.org/9.0.0/LLVM-9.0.0-win64.exe
-          7z x LLVM-9.0.0-win64.exe -y -o"llvm"
+          curl -fsSLO https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe
+          7z x LLVM-10.0.0-win64.exe -y -o"llvm"
           echo "::add-path::$(pwd)/llvm/bin"
           echo "::set-env name=WASM_AR::$(pwd)/llvm/bin/llvm-ar.exe"
       if: matrix.os == 'windows-latest'
@@ -34,18 +34,17 @@ jobs:
     - name: Install clang (MacOS)
       shell: bash
       run: |
-        curl -sSfL https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-darwin-apple.tar.xz | tar xJf -
-        ls clang+llvm-9.0.0-x86_64-darwin-apple
-        export CLANG_DIR=`pwd`/clang+llvm-9.0.0-x86_64-darwin-apple/bin
+        curl -sSfL https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-apple-darwin.tar.xz | tar xJf -
+        export CLANG_DIR=`pwd`/clang+llvm-10.0.0-x86_64-apple-darwin/bin
         echo "::add-path::$CLANG_DIR"
         echo "::set-env name=WASM_CC::$CLANG_DIR/clang"
       if: matrix.os == 'macos-latest'
 
     - name: Install clang (Linux)
       shell: bash
       run: |
-        curl -sSfL https://releases.llvm.org/9.0.0/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz | tar xJf -
-        export CLANG_DIR=`pwd`/clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-16.04/bin
+        curl -sSfL https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz | tar xJf -
+        export CLANG_DIR=`pwd`/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04/bin
         echo "::add-path::$CLANG_DIR"
         echo "::set-env name=WASM_CC::$CLANG_DIR/clang"
       if: matrix.os == 'ubuntu-latest'