Skip to content

Commit 9f1f7ff

Browse files
committed
Remove custom LLVM version because latest Substrate doesn't need it
1 parent d5965cd commit 9f1f7ff

File tree

3 files changed

+9
-46
lines changed

3 files changed

+9
-46
lines changed

.github/workflows/rust.yml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -69,23 +69,13 @@ jobs:
6969
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
7070

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

81-
# TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
82-
# thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
83-
- name: Install LLVM and Clang for Linux and Windows
84-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
85-
with:
86-
version: "15.0"
87-
if: runner.os != 'macOS'
88-
8979
- name: Install Protoc
9080
uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
9181
with:
@@ -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
- name: Install Protoc
178158
uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
179159
with:

.github/workflows/rustdoc.yml

Lines changed: 0 additions & 7 deletions
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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,13 @@ jobs:
126126
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # @v3.1.0
127127

128128
# On macOS, we need a proper Clang version, not Apple's custom version without wasm32 support
129-
# TODO: on macOS, the consensus/domain runtime build is not compatible with LLVM 15.0.7 and
130-
# LLVM 15.0.{3, 4, 5, 6} is not released for macOS thus install LLVM 15.0.2 explicitly as a
131-
# temporary workaround, and remove once incompatible is fixed.
132129
- name: Install LLVM and Clang for macOS
133-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
130+
uses: KyleMayes/install-llvm-action@be40c5af3a4adc3e4a03199995ab73aa37536712 # v1.9.0
134131
with:
135-
version: "15.0.2"
132+
# TODO: Switch to LLVM 17 on arm64 runners once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
133+
version: 15.0.7
136134
if: runner.os == 'macOS'
137135

138-
# TODO: on Linux and Windows, the consensus/domain runtime build is not compatible with LLVM 16,
139-
# thus install LLVM 15 explicitly as a temporary workaround, and remove once incompatible is fixed.
140-
- name: Install LLVM and Clang for Linux and Windows
141-
uses: KyleMayes/install-llvm-action@c135b3937686fd69c2651507aabc9925a8f9eee8 # v1.8.3
142-
with:
143-
version: "15.0"
144-
if: runner.os != 'macOS'
145-
146136
- name: Install Protoc
147137
uses: arduino/setup-protoc@9b1ee5b22b0a3f1feb8c2ff99b32c89b3c3191e9 # v2.0.0
148138
with:

0 commit comments

Comments
 (0)