From dee068c3253686068ea87f5cfd49e065dddbb358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCn=20=C3=96zerk?= Date: Fri, 31 Mar 2023 12:22:48 +0300 Subject: [PATCH] fix clang workflow (#162) --- .github/workflows/ci-tests.yml | 12 +++++++----- .github/workflows/release.yml | 7 +++++++ .github/workflows/rustdoc.yml | 5 ----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4b5be39c..7afa11b8 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -49,16 +49,18 @@ jobs: - name: git checkout uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0 + # On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support + - name: Install LLVM and Clang + uses: KyleMayes/install-llvm-action@8852e4d5c58653ed05135c0a5d949d9c2febcb00 # v1.6.1 + with: + version: "15.0" + if: runner.os == 'macOS' + - name: Install Protoc uses: arduino/setup-protoc@v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Install LLVM and Clang - uses: KyleMayes/install-llvm-action@665aaf9d6fba342a852f55fecc5688e7f00e6663 # v1.6.0 - with: - version: "14.0" - # Workaround to resolve link error with C:\msys64\mingw64\bin\libclang.dll - name: Remove msys64 run: Remove-Item -LiteralPath "C:\msys64\" -Force -Recurse diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a394030..1904fd69 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,6 +51,13 @@ jobs: - name: Checkout uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0 + # On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support + - name: Install LLVM and Clang + uses: KyleMayes/install-llvm-action@8852e4d5c58653ed05135c0a5d949d9c2febcb00 # v1.6.1 + with: + version: "15.0" + if: runner.os == 'macOS' + - name: Install Protoc uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3 # @v1.1.2 with: diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml index ae70621e..f1e0c32a 100644 --- a/.github/workflows/rustdoc.yml +++ b/.github/workflows/rustdoc.yml @@ -22,11 +22,6 @@ jobs: - name: Install Protoc uses: arduino/setup-protoc@v1 - - name: Install LLVM and Clang - uses: KyleMayes/install-llvm-action@v1 - with: - version: "14.0" - - name: Build docs uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1 with: