Skip to content

Commit d793520

Browse files
nazar-pcnazar-pc
authored
Merge pull request #2555 from subspace/remove-custom-llvm-version
Remove custom LLVM version because latest Substrate doesn't need it, work around substrate-wasm-builder issue with newer LLVM
2 parents 492586f + cb08a9a commit d793520

File tree

7 files changed

+17
-46
lines changed

7 files changed

+17
-46
lines changed

‎.github/workflows/rust.yml

+6-26
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,13 @@ jobs:
6666
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
6767

6868
# On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
69-
# TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
70-
# LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
71-
# temporary workaround, and remove once incompatible is fixed.
7269
- name: Install LLVM and Clang for macOS
73-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
70+
uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
7471
with:
75-
version: "15.0.2"
72+
# TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
73+
version: 15.0.7
7674
if: runner.os == 'macOS'
7775

78-
# TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
79-
# thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
80-
- name: Install LLVM and Clang for Linux and Windows
81-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
82-
with:
83-
version: "15.0"
84-
if: runner.os != 'macOS'
85-
8676
# TODO: Workaround for https://github.com/actions/runner-images/issues/9290
8777
- name: Install glibtoolize (macOS)
8878
run: brew install libtool
@@ -157,23 +147,13 @@ jobs:
157147
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
158148

159149
# On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
160-
# TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
161-
# LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
162-
# temporary workaround, and remove once incompatible is fixed.
163150
- name: Install LLVM and Clang for macOS
164-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
151+
uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
165152
with:
166-
version: "15.0.2"
153+
# TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
154+
version: 15.0.7
167155
if: runner.os == 'macOS'
168156

169-
# TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
170-
# thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
171-
- name: Install LLVM and Clang for Linux and Windows
172-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
173-
with:
174-
version: "15.0"
175-
if: runner.os != 'macOS'
176-
177157
# TODO: Workaround for https://github.com/actions/runner-images/issues/9290
178158
- name: Install glibtoolize (macOS)
179159
run: brew install libtool

‎.github/workflows/rustdoc.yml

-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ jobs:
2222
- name: Checkout repository
2323
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
2424

25-
# TODO: on Linux and Windows, LLVM 16 is not compatible with the consensus/domain runtime build
26-
# thus install LLVM 15 explicitly as a temporary workaround, and remove once it is fixed.
27-
- name: Install LLVM and Clang
28-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
29-
with:
30-
version: "15.0"
31-
3225
- name: Install Protoc
3326
uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
3427
with:

‎.github/workflows/snapshot-build.yml

+3-13
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,13 @@ jobs:
135135
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
136136

137137
# On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
138-
# TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
139-
# LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
140-
# temporary workaround, and remove once incompatible is fixed.
141138
- name: Install LLVM and Clang for macOS
142-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
139+
uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
143140
with:
144-
version: "15.0.2"
141+
# TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
142+
version: 15.0.7
145143
if: runner.os == 'macOS'
146144

147-
# TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
148-
# thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
149-
- name: Install LLVM and Clang for Linux and Windows
150-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
151-
with:
152-
version: "15.0"
153-
if: runner.os != 'macOS'
154-
155145
# TODO: Workaround for https://github.com/actions/runner-images/issues/9290
156146
- name: Install glibtoolize (macOS)
157147
run: brew install libtool

‎crates/subspace-runtime/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
fn main() {
1818
#[cfg(feature = "std")]
1919
{
20+
// TODO: Workaround for https://github.com/paritytech/polkadot-sdk/issues/3192
21+
std::env::set_var("CFLAGS", "-mcpu=mvp");
2022
substrate_wasm_builder::WasmBuilder::new()
2123
.with_current_project()
2224
.export_heap_base()

‎domains/runtime/evm/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fn main() {
22
#[cfg(feature = "std")]
33
{
4+
// TODO: Workaround for https://github.com/paritytech/polkadot-sdk/issues/3192
5+
std::env::set_var("CFLAGS", "-mcpu=mvp");
46
substrate_wasm_builder::WasmBuilder::new()
57
.with_current_project()
68
.export_heap_base()

‎domains/test/runtime/evm/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
fn main() {
22
#[cfg(feature = "std")]
33
{
4+
// TODO: Workaround for https://github.com/paritytech/polkadot-sdk/issues/3192
5+
std::env::set_var("CFLAGS", "-mcpu=mvp");
46
substrate_wasm_builder::WasmBuilder::new()
57
.with_current_project()
68
.export_heap_base()

‎test/subspace-test-runtime/build.rs

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
fn main() {
1818
#[cfg(feature = "std")]
1919
{
20+
// TODO: Workaround for https://github.com/paritytech/polkadot-sdk/issues/3192
21+
std::env::set_var("CFLAGS", "-mcpu=mvp");
2022
substrate_wasm_builder::WasmBuilder::new()
2123
.with_current_project()
2224
.export_heap_base()

0 commit comments

Comments
 (0)