Skip to content

Commit 51af0a8

Browse files
authored
Fix ci (#3717)
commit-id:5e1132ec
1 parent 270bc8a commit 51af0a8

File tree

3 files changed

+53
-40
lines changed

3 files changed

+53
-40
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Setup Rust + LLVM 19
2+
description: Installs Rust and LLVM 19 toolchain
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
- uses: dtolnay/rust-toolchain@stable
8+
9+
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
10+
11+
- name: Add LLVM APT repository
12+
uses: myci-actions/add-deb-repo@11
13+
with:
14+
repo: deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main
15+
repo-name: llvm-repo
16+
keys-asc: https://apt.llvm.org/llvm-snapshot.gpg.key
17+
18+
- name: Install LLVM
19+
shell: bash
20+
run: |
21+
sudo apt-get update
22+
sudo apt-get install -y \
23+
llvm-19 llvm-19-dev llvm-19-runtime \
24+
clang-19 clang-tools-19 \
25+
lld-19 libpolly-19-dev libmlir-19-dev mlir-19-tools
26+
27+
- name: Set environment variables
28+
shell: bash
29+
run: |
30+
echo "MLIR_SYS_190_PREFIX=/usr/lib/llvm-19/" >> $GITHUB_ENV
31+
echo "LLVM_SYS_191_PREFIX=/usr/lib/llvm-19/" >> $GITHUB_ENV
32+
echo "TABLEGEN_190_PREFIX=/usr/lib/llvm-19/" >> $GITHUB_ENV

.github/workflows/ci.yml

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: dtolnay/rust-toolchain@stable
22-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
21+
- uses: ./.github/actions/setup-rust-llvm
2322
- uses: software-mansion/setup-scarb@v1
2423
- uses: software-mansion/setup-universal-sierra-compiler@v1
2524
- run: cargo test --release --lib -p forge
@@ -30,8 +29,7 @@ jobs:
3029
fail-fast: false
3130
steps:
3231
- uses: actions/checkout@v4
33-
- uses: dtolnay/rust-toolchain@stable
34-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
32+
- uses: ./.github/actions/setup-rust-llvm
3533
- name: Install nextest
3634
uses: taiki-e/install-action@v2
3735
with:
@@ -123,8 +121,7 @@ jobs:
123121
runs-on: ubuntu-latest
124122
steps:
125123
- uses: actions/checkout@v4
126-
- uses: dtolnay/rust-toolchain@stable
127-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
124+
- uses: ./.github/actions/setup-rust-llvm
128125
- uses: software-mansion/setup-universal-sierra-compiler@v1
129126
- uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
130127
- run: cargo test --package forge e2e::plugin_versions
@@ -134,8 +131,7 @@ jobs:
134131
runs-on: ubuntu-latest
135132
steps:
136133
- uses: actions/checkout@v4
137-
- uses: dtolnay/rust-toolchain@stable
138-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
134+
- uses: ./.github/actions/setup-rust-llvm
139135
- uses: software-mansion/setup-universal-sierra-compiler@v1
140136

141137
- run: cargo test --package forge --features no_scarb_installed --lib compatibility_check::tests::failing_tool_not_installed
@@ -155,8 +151,7 @@ jobs:
155151
runs-on: ubuntu-latest
156152
steps:
157153
- uses: actions/checkout@v4
158-
- uses: dtolnay/rust-toolchain@stable
159-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
154+
- uses: ./.github/actions/setup-rust-llvm
160155
- uses: software-mansion/setup-scarb@v1
161156
- uses: software-mansion/setup-universal-sierra-compiler@v1
162157

@@ -168,17 +163,15 @@ jobs:
168163
runs-on: ubuntu-latest
169164
steps:
170165
- uses: actions/checkout@v4
171-
- uses: dtolnay/rust-toolchain@stable
172-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
166+
- uses: ./.github/actions/setup-rust-llvm
173167
- run: cargo test --release -p forge_runner
174168

175169
test-cheatnet:
176170
name: Test Cheatnet
177171
runs-on: ubuntu-latest
178172
steps:
179173
- uses: actions/checkout@v4
180-
- uses: dtolnay/rust-toolchain@stable
181-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
174+
- uses: ./.github/actions/setup-rust-llvm
182175
- uses: software-mansion/setup-scarb@v1
183176
- uses: software-mansion/setup-universal-sierra-compiler@v1
184177
- name: Run Cheatnet tests
@@ -189,8 +182,7 @@ jobs:
189182
runs-on: ubuntu-latest
190183
steps:
191184
- uses: actions/checkout@v4
192-
- uses: dtolnay/rust-toolchain@stable
193-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
185+
- uses: ./.github/actions/setup-rust-llvm
194186
- name: Run Data Transformer tests
195187
run: cargo test --release -p data-transformer
196188

@@ -199,8 +191,7 @@ jobs:
199191
runs-on: ubuntu-latest
200192
steps:
201193
- uses: actions/checkout@v4
202-
- uses: dtolnay/rust-toolchain@stable
203-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
194+
- uses: ./.github/actions/setup-rust-llvm
204195
- uses: software-mansion/setup-scarb@v1
205196
- uses: software-mansion/setup-universal-sierra-compiler@58146c4184fa6ec5e8aaf02309ab85e35f782ed0 # v1.0.0
206197
- name: Run Forge Debugging tests
@@ -237,10 +228,7 @@ jobs:
237228
runs-on: ubuntu-latest
238229
steps:
239230
- uses: actions/checkout@v4
240-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
241-
with:
242-
toolchain: stable
243-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
231+
- uses: ./.github/actions/setup-rust-llvm
244232
- uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
245233
- uses: software-mansion/setup-scarb@v1
246234
- uses: software-mansion/setup-universal-sierra-compiler@v1
@@ -252,10 +240,7 @@ jobs:
252240
runs-on: ubuntu-latest
253241
steps:
254242
- uses: actions/checkout@v4
255-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
256-
with:
257-
toolchain: stable
258-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
243+
- uses: ./.github/actions/setup-rust-llvm
259244
- name: Run tests
260245
run: cargo test --release -p conversions
261246

@@ -273,9 +258,7 @@ jobs:
273258
runs-on: ubuntu-latest
274259
steps:
275260
- uses: actions/checkout@v4
276-
- uses: dtolnay/rust-toolchain@stable
277-
- uses: software-mansion/setup-universal-sierra-compiler@v1
278-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
261+
- uses: ./.github/actions/setup-rust-llvm
279262
- uses: software-mansion/setup-scarb@v1
280263
- uses: software-mansion/setup-universal-sierra-compiler@v1
281264
- run: cargo test --release -p scarb-api
@@ -323,10 +306,7 @@ jobs:
323306
RUSTFLAGS: "-Dwarnings"
324307
steps:
325308
- uses: actions/checkout@v4
326-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
327-
with:
328-
toolchain: stable
329-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
309+
- uses: ./.github/actions/setup-rust-llvm
330310
- run: cargo lint
331311

332312
- name: Lint snforge-scarb-plugin
@@ -343,11 +323,8 @@ jobs:
343323
env:
344324
MDBOOK_VERSION: 0.4.52
345325
steps:
346-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
347-
with:
348-
toolchain: stable
349-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
350326
- uses: actions/checkout@v4
327+
- uses: ./.github/actions/setup-rust-llvm
351328
- uses: software-mansion/setup-scarb@v1
352329
- uses: software-mansion/setup-universal-sierra-compiler@v1
353330
- name: Install mdBook

crates/forge/tests/e2e/backtrace.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ fn test_backtrace_missing_env() {
2727
fn test_backtrace_native_execution() {
2828
let temp = setup_package("backtrace_vm_error");
2929

30-
test_runner(&temp)
30+
let output = test_runner(&temp)
3131
.arg("--run-native")
3232
.env("SNFORGE_BACKTRACE", "1")
3333
.assert()
34-
.code(2)
35-
.stdout_eq("[ERROR] Backtrace generation is not supported with `cairo-native` execution\n");
34+
.code(2);
35+
36+
assert_stdout_contains(
37+
output,
38+
"[ERROR] Backtrace generation is not supported with `cairo-native` execution\n",
39+
);
3640
}
3741

3842
#[test]

0 commit comments

Comments
 (0)