Skip to content

Commit c5a059b

Browse files
ksew1cptartur
authored andcommitted
Fix ci (#3717)
commit-id:5e1132ec
1 parent c33bb75 commit c5a059b

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@v5
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 --profile ci --lib -p forge
@@ -30,8 +29,7 @@ jobs:
3029
fail-fast: false
3130
steps:
3231
- uses: actions/checkout@v5
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@v5
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 --profile ci --package forge e2e::plugin_versions
@@ -135,8 +132,7 @@ jobs:
135132
runs-on: ubuntu-latest
136133
steps:
137134
- uses: actions/checkout@v5
138-
- uses: dtolnay/rust-toolchain@stable
139-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
135+
- uses: ./.github/actions/setup-rust-llvm
140136
- uses: software-mansion/setup-universal-sierra-compiler@v1
141137

142138
- run: cargo test --profile ci --package forge --features no_scarb_installed --lib compatibility_check::tests::failing_tool_not_installed
@@ -153,8 +149,7 @@ jobs:
153149
runs-on: ubuntu-latest
154150
steps:
155151
- uses: actions/checkout@v5
156-
- uses: dtolnay/rust-toolchain@stable
157-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
152+
- uses: ./.github/actions/setup-rust-llvm
158153
- uses: software-mansion/setup-scarb@v1
159154
- uses: software-mansion/setup-universal-sierra-compiler@v1
160155

@@ -166,17 +161,15 @@ jobs:
166161
runs-on: ubuntu-latest
167162
steps:
168163
- uses: actions/checkout@v5
169-
- uses: dtolnay/rust-toolchain@stable
170-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
164+
- uses: ./.github/actions/setup-rust-llvm
171165
- run: cargo test --profile ci -p forge_runner
172166

173167
test-cheatnet:
174168
name: Test Cheatnet
175169
runs-on: ubuntu-latest
176170
steps:
177171
- uses: actions/checkout@v5
178-
- uses: dtolnay/rust-toolchain@stable
179-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
172+
- uses: ./.github/actions/setup-rust-llvm
180173
- uses: software-mansion/setup-scarb@v1
181174
- uses: software-mansion/setup-universal-sierra-compiler@v1
182175
- name: Run Cheatnet tests
@@ -187,8 +180,7 @@ jobs:
187180
runs-on: ubuntu-latest
188181
steps:
189182
- uses: actions/checkout@v5
190-
- uses: dtolnay/rust-toolchain@stable
191-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
183+
- uses: ./.github/actions/setup-rust-llvm
192184
- name: Run Data Transformer tests
193185
run: cargo test --profile ci -p data-transformer
194186

@@ -197,8 +189,7 @@ jobs:
197189
runs-on: ubuntu-latest
198190
steps:
199191
- uses: actions/checkout@v5
200-
- uses: dtolnay/rust-toolchain@stable
201-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
192+
- uses: ./.github/actions/setup-rust-llvm
202193
- uses: software-mansion/setup-scarb@v1
203194
- uses: software-mansion/setup-universal-sierra-compiler@58146c4184fa6ec5e8aaf02309ab85e35f782ed0 # v1.0.0
204195
- name: Run Forge Debugging tests
@@ -235,10 +226,7 @@ jobs:
235226
runs-on: ubuntu-latest
236227
steps:
237228
- uses: actions/checkout@v5
238-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
239-
with:
240-
toolchain: stable
241-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
229+
- uses: ./.github/actions/setup-rust-llvm
242230
- uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
243231
- uses: software-mansion/setup-scarb@v1
244232
- uses: software-mansion/setup-universal-sierra-compiler@v1
@@ -250,10 +238,7 @@ jobs:
250238
runs-on: ubuntu-latest
251239
steps:
252240
- uses: actions/checkout@v5
253-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
254-
with:
255-
toolchain: stable
256-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
241+
- uses: ./.github/actions/setup-rust-llvm
257242
- name: Run tests
258243
run: cargo test --profile ci -p conversions
259244

@@ -271,9 +256,7 @@ jobs:
271256
runs-on: ubuntu-latest
272257
steps:
273258
- uses: actions/checkout@v5
274-
- uses: dtolnay/rust-toolchain@stable
275-
- uses: software-mansion/setup-universal-sierra-compiler@v1
276-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
259+
- uses: ./.github/actions/setup-rust-llvm
277260
- uses: software-mansion/setup-scarb@v1
278261
- uses: software-mansion/setup-universal-sierra-compiler@v1
279262
- run: cargo test --profile ci -p scarb-api
@@ -321,10 +304,7 @@ jobs:
321304
RUSTFLAGS: "-Dwarnings"
322305
steps:
323306
- uses: actions/checkout@v5
324-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
325-
with:
326-
toolchain: stable
327-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
307+
- uses: ./.github/actions/setup-rust-llvm
328308
- run: cargo lint
329309

330310
- name: Lint snforge-scarb-plugin
@@ -341,11 +321,8 @@ jobs:
341321
env:
342322
MDBOOK_VERSION: 0.4.52
343323
steps:
344-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
345-
with:
346-
toolchain: stable
347-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
348324
- uses: actions/checkout@v5
325+
- uses: ./.github/actions/setup-rust-llvm
349326
- uses: software-mansion/setup-scarb@v1
350327
- uses: software-mansion/setup-universal-sierra-compiler@v1
351328
- 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)