Merge pull request #137 from subspace/remove-llvm-workarounds

Remove LLVM workarounds in CI
autonomys · Mar 1, 2024 · 3ed8bbd · 3ed8bbd
2 parents bf1e73a + a62f237
commit 3ed8bbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 41 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -102,23 +102,13 @@ jobs:
         if: runner.os == 'Windows'
 
       # On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
-      # TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
-      # LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
-      # temporary workaround, and remove once incompatible is fixed.
       - name: Install LLVM and Clang for macOS
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
+        uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
         with:
-          version: "15.0.2"
+          # TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
+          version: 15.0.7
         if: runner.os == 'macOS'
 
-      # TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
-      # thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
-      - name: Install LLVM and Clang for Linux and Windows
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
-        with:
-          version: "15.0"
-        if: runner.os != 'macOS'
-
       - name: Install Protoc
         uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
         with:

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -120,24 +120,13 @@ jobs:
         if: runner.os == 'Windows'
 
       # On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
-      # TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
-      # LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
-      # temporary workaround, and remove once incompatible is fixed.
       - name: Install LLVM and Clang for macOS
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
+        uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
         with:
-          version: "15.0.2"
+          # TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
+          version: 15.0.7
         if: runner.os == 'macOS'
 
-      # TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
-      # thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
-      - name: Install LLVM and Clang for Linux and Windows
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
-        with:
-          version: "15.0"
-        if: runner.os != 'macOS'
-
-      # TODO: Workaround for https://github.com/actions/runner-images/issues/9290
       - name: Install glibtoolize (macOS)
         run: brew install libtool
         if: runner.os == 'macOS'
@@ -240,24 +229,13 @@ jobs:
         if: runner.os == 'Windows'
 
       # On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
-      # TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
-      # LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
-      # temporary workaround, and remove once incompatible is fixed.
       - name: Install LLVM and Clang for macOS
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
+        uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
         with:
-          version: "15.0.2"
+          # TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
+          version: 15.0.7
         if: runner.os == 'macOS'
 
-      # TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
-      # thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
-      - name: Install LLVM and Clang for Linux and Windows
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
-        with:
-          version: "15.0"
-        if: runner.os != 'macOS'
-
-      # TODO: Workaround for https://github.com/actions/runner-images/issues/9290
       - name: Install glibtoolize (macOS)
         run: brew install libtool
         if: runner.os == 'macOS'