Merge pull request #2427 from subspace/llvm-upgrade

LLVM upgrade
autonomys · Jan 19, 2024 · c18e0dc · c18e0dc
2 parents d5965cd + 4fc1903
commit c18e0dc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 47 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -69,23 +69,13 @@ jobs:
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
 
       # 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:
@@ -157,23 +147,13 @@ jobs:
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
 
       # 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/rustdoc.yml b/.github/workflows/rustdoc.yml
@@ -22,13 +22,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
 
-      # TODO: on Linux and Windows, LLVM 16 is not compatible with the consensus/domain runtime build
-      # thus install LLVM 15 explicitly as a temporary workaround, and remove once it is fixed.
-      - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
-        with:
-          version: "15.0"
-
       - name: Install Protoc
         uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
         with:

diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
@@ -126,23 +126,13 @@ jobs:
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
 
       # 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/crates/subspace-farmer/src/utils.rs b/crates/subspace-farmer/src/utils.rs
@@ -18,7 +18,9 @@ use std::task::{Context, Poll};
 use std::{io, thread};
 use tokio::runtime::Handle;
 use tokio::task;
-use tracing::{debug, warn};
+use tracing::debug;
+#[cfg(feature = "numa")]
+use tracing::warn;
 
 /// Joins async join handle on drop
 pub struct AsyncJoinOnDrop<T> {