Skip to content

Commit cdf4889

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

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
@@ -152,8 +148,7 @@ jobs:
152148
runs-on: ubuntu-latest
153149
steps:
154150
- uses: actions/checkout@v4
155-
- uses: dtolnay/rust-toolchain@stable
156-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
151+
- uses: ./.github/actions/setup-rust-llvm
157152
- uses: software-mansion/setup-scarb@v1
158153
- uses: software-mansion/setup-universal-sierra-compiler@v1
159154

@@ -165,17 +160,15 @@ jobs:
165160
runs-on: ubuntu-latest
166161
steps:
167162
- uses: actions/checkout@v4
168-
- uses: dtolnay/rust-toolchain@stable
169-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
163+
- uses: ./.github/actions/setup-rust-llvm
170164
- run: cargo test --release -p forge_runner
171165

172166
test-cheatnet:
173167
name: Test Cheatnet
174168
runs-on: ubuntu-latest
175169
steps:
176170
- uses: actions/checkout@v4
177-
- uses: dtolnay/rust-toolchain@stable
178-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
171+
- uses: ./.github/actions/setup-rust-llvm
179172
- uses: software-mansion/setup-scarb@v1
180173
- uses: software-mansion/setup-universal-sierra-compiler@v1
181174
- name: Run Cheatnet tests
@@ -186,8 +179,7 @@ jobs:
186179
runs-on: ubuntu-latest
187180
steps:
188181
- uses: actions/checkout@v4
189-
- uses: dtolnay/rust-toolchain@stable
190-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
182+
- uses: ./.github/actions/setup-rust-llvm
191183
- name: Run Data Transformer tests
192184
run: cargo test --release -p data-transformer
193185

@@ -196,8 +188,7 @@ jobs:
196188
runs-on: ubuntu-latest
197189
steps:
198190
- uses: actions/checkout@v4
199-
- uses: dtolnay/rust-toolchain@stable
200-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
191+
- uses: ./.github/actions/setup-rust-llvm
201192
- uses: software-mansion/setup-scarb@v1
202193
- uses: software-mansion/setup-universal-sierra-compiler@58146c4184fa6ec5e8aaf02309ab85e35f782ed0 # v1.0.0
203194
- name: Run Forge Debugging tests
@@ -234,10 +225,7 @@ jobs:
234225
runs-on: ubuntu-latest
235226
steps:
236227
- uses: actions/checkout@v4
237-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
238-
with:
239-
toolchain: stable
240-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
228+
- uses: ./.github/actions/setup-rust-llvm
241229
- uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
242230
- uses: software-mansion/setup-scarb@v1
243231
- uses: software-mansion/setup-universal-sierra-compiler@v1
@@ -249,10 +237,7 @@ jobs:
249237
runs-on: ubuntu-latest
250238
steps:
251239
- uses: actions/checkout@v4
252-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
253-
with:
254-
toolchain: stable
255-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
240+
- uses: ./.github/actions/setup-rust-llvm
256241
- name: Run tests
257242
run: cargo test --release -p conversions
258243

@@ -270,9 +255,7 @@ jobs:
270255
runs-on: ubuntu-latest
271256
steps:
272257
- uses: actions/checkout@v4
273-
- uses: dtolnay/rust-toolchain@stable
274-
- uses: software-mansion/setup-universal-sierra-compiler@v1
275-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
258+
- uses: ./.github/actions/setup-rust-llvm
276259
- uses: software-mansion/setup-scarb@v1
277260
- uses: software-mansion/setup-universal-sierra-compiler@v1
278261
- run: cargo test --release -p scarb-api
@@ -320,10 +303,7 @@ jobs:
320303
RUSTFLAGS: "-Dwarnings"
321304
steps:
322305
- uses: actions/checkout@v4
323-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
324-
with:
325-
toolchain: stable
326-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
306+
- uses: ./.github/actions/setup-rust-llvm
327307
- run: cargo lint
328308

329309
- name: Lint snforge-scarb-plugin
@@ -340,11 +320,8 @@ jobs:
340320
env:
341321
MDBOOK_VERSION: 0.4.52
342322
steps:
343-
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
344-
with:
345-
toolchain: stable
346-
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
347323
- uses: actions/checkout@v4
324+
- uses: ./.github/actions/setup-rust-llvm
348325
- uses: software-mansion/setup-scarb@v1
349326
- uses: software-mansion/setup-universal-sierra-compiler@v1
350327
- 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)