diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dc984558d..364ce38b9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -373,6 +373,9 @@ jobs: run: git fetch origin --deepen=1 - name: Setup Rust run: rustup update stable --no-self-update && rustup default stable + - uses: cargo-bins/cargo-binstall@main + - name: Install cargo-component + run: cargo binstall --no-confirm cargo-component@0.13.2 - uses: Swatinem/rust-cache@v2 with: shared-key: debug @@ -388,11 +391,6 @@ jobs: with: redis-version: latest auto-start: false - - uses: cargo-bins/cargo-binstall@main - - name: Install cargo-component - run: cargo binstall --no-confirm cargo-component@0.13.2 - - name: Debug env - run: which cargo-component - name: Integration tests env: QUIET: true diff --git a/Makefile.toml b/Makefile.toml index ff4b83d0c..8e5f33447 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -251,12 +251,11 @@ description = "Runs integration tests only" dependencies = ["build-bins"] env = { "RUST_LOG" = "info", "RUST_BACKTRACE" = "1" } script = ''' -#cargo test --package integration-tests --test integration -- --nocapture --report-time $JUNIT_OPTS -#cargo test --package golem-component-service-base --test tests -- --nocapture --report-time $JUNIT_OPTS -#cargo test --package golem-worker-service-base --test services_tests -- --nocapture --report-time $JUNIT_OPTS -#cargo test --package golem-worker-service-base --test api_gateway_end_to_end_tests -- --nocapture --report-time $JUNIT_OPTS -#cargo test --package golem-service-base --test integration -- --nocapture --report-time $JUNIT_OPTS -which cargo-component +cargo test --package integration-tests --test integration -- --nocapture --report-time $JUNIT_OPTS +cargo test --package golem-component-service-base --test tests -- --nocapture --report-time $JUNIT_OPTS +cargo test --package golem-worker-service-base --test services_tests -- --nocapture --report-time $JUNIT_OPTS +cargo test --package golem-worker-service-base --test api_gateway_end_to_end_tests -- --nocapture --report-time $JUNIT_OPTS +cargo test --package golem-service-base --test integration -- --nocapture --report-time $JUNIT_OPTS cargo test --package wasm-rpc-stubgen-tests-integration --tests -- --nocapture --test-threads=1 --report-time ''' # $JUNIT_OPTS temporarily removed from wasm-rpc-stubgen-tests-integration to help debugging on CI diff --git a/wasm-rpc-stubgen/tests-integration/tests/compose.rs b/wasm-rpc-stubgen/tests-integration/tests/compose.rs index 7c2b34993..c14c6449f 100644 --- a/wasm-rpc-stubgen/tests-integration/tests/compose.rs +++ b/wasm-rpc-stubgen/tests-integration/tests/compose.rs @@ -33,18 +33,6 @@ test_r::enable!(); #[test] async fn compose_with_single_stub() { - // TODO: just for CI debug - std::process::Command::new("sh") - .arg("-c") - .arg("which cargo-component") - .status() - .unwrap(); - std::process::Command::new("sh") - .arg("-c") - .arg("which cargo") - .status() - .unwrap(); - let (_source_dir, stub_dir, stub_wasm) = init_stub("all-wit-types").await; let caller_dir = init_caller("caller-no-dep-importstub");