From 9f1f7ffa275ebd12d6d614aacdcdad0769bd5dd6 Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Thu, 18 Jan 2024 14:31:16 +0200 Subject: [PATCH 1/2] Remove custom LLVM version because latest Substrate doesn't need it --- .github/workflows/rust.yml | 32 ++++++---------------------- .github/workflows/rustdoc.yml | 7 ------ .github/workflows/snapshot-build.yml | 16 +++----------- 3 files changed, 9 insertions(+), 46 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 12a78598c8..100e204801 100644 --- 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 index 48d7a8cfcb..12f7d8213a 100644 --- 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 index 6922881ab6..03f3f77001 100644 --- 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: From 4fc1903c549592514c3ab0fa4dece51883ea89f4 Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Fri, 19 Jan 2024 14:22:56 +0200 Subject: [PATCH 2/2] Tiny conditional compilation fix --- crates/subspace-farmer/src/utils.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/subspace-farmer/src/utils.rs b/crates/subspace-farmer/src/utils.rs index 7d47edd68e..45e84519cf 100644 --- 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 {