Skip to content

Commit d7781bd

Browse files
committed
Run oracles tests on CI
commit-id:743274ba
1 parent 39d7741 commit d7781bd

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

.github/actions/setup-tools/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ inputs:
1010
description: 'Whether to setup scarb'
1111
required: false
1212
default: 'true'
13+
scarb-version:
14+
description: 'Optional: Scarb version to install. If not set, uses version from .tool-versions'
15+
required: false
16+
default: ''
1317
setup-usc:
1418
description: 'Whether to setup universal-sierra-compiler'
1519
required: false
@@ -24,6 +28,8 @@ runs:
2428

2529
- uses: software-mansion/setup-scarb@v1
2630
if: ${{ inputs.setup-scarb == 'true' }}
31+
with:
32+
scarb-version: ${{ inputs.scarb-version }}
2733

2834
- uses: software-mansion/setup-universal-sierra-compiler@v1
2935
if: ${{ inputs.setup-usc == 'true' }}

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,16 @@ jobs:
256256
- name: Run Data Transformer tests
257257
run: cargo test --profile ci -p data-transformer
258258

259+
test-forge-oracles:
260+
name: Test Oracles in Forge
261+
runs-on: ubuntu-latest
262+
steps:
263+
- uses: actions/checkout@v5
264+
- uses: ./.github/actions/setup-tools
265+
with:
266+
scarb-version: '2.13.1'
267+
- run: cargo test --profile ci -p forge --features run_test_for_scarb_since_2_13 e2e::oracles
268+
259269
test-forge-scarb-plugin:
260270
name: Test Forge Scarb Plugin
261271
runs-on: ubuntu-latest

crates/forge/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ no_scarb_installed = []
1111
non_exact_gas_assertions = []
1212
skip_test_for_only_latest_scarb = []
1313
skip_test_for_scarb_since_2_11 = []
14+
run_test_for_scarb_since_2_13 = []
1415
test_for_multiple_scarb_versions = []
1516
cairo-native = ["cheatnet/cairo-native", "scarb-api/cairo-native"]
1617

crates/forge/tests/e2e/oracles.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,14 @@ use crate::e2e::common::runner::{
22
setup_package_with_file_patterns, test_runner, Package, BASE_FILE_PATTERNS,
33
};
44
use indoc::indoc;
5-
use scarb_api::version::scarb_version;
65
use shared::test_utils::output_assert::assert_stdout_contains;
76

8-
fn scarb_supports_oracles() -> bool {
9-
scarb_version().unwrap().scarb
10-
>= semver::Version::parse("2.12.3+nightly-2025-10-21").unwrap()
11-
}
12-
7+
#[cfg_attr(
8+
not(feature = "run_test_for_scarb_since_2_13"),
9+
ignore = "Skipping test because feature skip_test_for_scarb_2_13 enabled"
10+
)]
1311
#[test]
1412
fn wasm() {
15-
// TODO use feature here
16-
if !scarb_supports_oracles() {
17-
eprintln!("skipping because scarb does not fully support oracles");
18-
return;
19-
}
20-
2113
let temp = setup_package_with_file_patterns(
2214
Package::Name("wasm_oracles".to_string()),
2315
&[BASE_FILE_PATTERNS, &["*.wasm"]].concat(),

0 commit comments

Comments
 (0)