Skip to content

Commit

Permalink
revert CI changes & do it in another PR
Browse files Browse the repository at this point in the history
Signed-off-by: smtmfft <[email protected]>
  • Loading branch information
smtmfft committed Jan 11, 2025
1 parent ed6a50e commit 9c57686
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 39 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/ci-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ on:
workflow_call:
pull_request:
paths:
- "core/**"
- "host/**"
- "lib/**"
- "!doc/**"
- "script/**"
- "taskdb/**"

jobs:
Expand Down Expand Up @@ -40,7 +35,7 @@ jobs:
uses: ./.github/workflows/ci-build-test-reusable.yml
with:
version_name: "native"
version_toolchain: "nightly-2024-09-05"
version_toolchain: "nightly-2024-04-17"
taskdb: ${{ needs.set-taskdb.outputs.taskdb }}

integration-test-native:
Expand All @@ -49,5 +44,5 @@ jobs:
uses: ./.github/workflows/ci-integration-reusable.yml
with:
version_name: "native"
version_toolchain: "nightly-2024-09-05"
version_toolchain: "nightly-2024-04-17"
taskdb: ${{ needs.set-taskdb.outputs.taskdb }}
11 changes: 2 additions & 9 deletions .github/workflows/ci-risc0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,22 @@ on:
paths:
- "provers/risc0/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"
pull_request:
paths:
- "provers/risc0/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"

jobs:
build-test-risc0:
name: Build and test risc0
uses: ./.github/workflows/ci-build-test-reusable.yml
with:
version_name: "risc0"
version_toolchain: "nightly-2024-09-05"
taskdb: "raiko-tasks/in-memory"
version_toolchain: "stable"

integration-test-risc0:
name: Run integration tests on risc0
uses: ./.github/workflows/ci-integration-reusable.yml
with:
version_name: "risc0"
version_toolchain: "nightly-2024-09-05"
taskdb: "raiko-tasks/in-memory"

version_toolchain: "nightly-2024-04-17"
6 changes: 0 additions & 6 deletions .github/workflows/ci-sgx-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ on:
paths:
- "provers/sgx/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"
pull_request:
paths:
- "provers/sgx/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"

jobs:
build-test-sgx:
Expand All @@ -23,15 +19,13 @@ jobs:
with:
version_name: "sgx"
version_toolchain: "stable"
taskdb: "raiko-tasks/in-memory"

integration-test-sgx:
name: Run integration tests on sgx
uses: ./.github/workflows/ci-integration-reusable.yml
with:
version_name: "sgx"
version_toolchain: "nightly-2024-04-17"
taskdb: "raiko-tasks/in-memory"

build-test-sgx-docker:
name: Build and test sgx with Docker
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci-sgx-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ on:
paths:
- "docker/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"
pull_request:
paths:
- "docker/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"

jobs:
build-test-sgx-with-docker:
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/ci-sp1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,22 @@ on:
paths:
- "provers/sp1/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"
pull_request:
paths:
- "provers/sp1/**"
- "!docs/**"
- "script/build.sh"
- "script/install.sh"

jobs:
build-test-sp1:
name: Build and test sp1
uses: ./.github/workflows/ci-build-test-reusable.yml
with:
version_name: "sp1"
version_toolchain: "nightly-2024-09-05"
taskdb: "raiko-tasks/in-memory"
version_toolchain: "nightly-2024-04-18"

integration-test-sp1:
name: Run integration tests on sp1
uses: ./.github/workflows/ci-integration-reusable.yml
with:
version_name: "sp1"
version_toolchain: "nightly-2024-09-05"
taskdb: "raiko-tasks/in-memory"

version_toolchain: "nightly-2024-04-17"
8 changes: 4 additions & 4 deletions host/tests/test/cancel_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ pub async fn test_v2_mainnet_native_cancel() {
status,
api::v2::Status::Ok {
data: api::v2::ProofResponse::Status {
status: TaskStatus::Registered | TaskStatus::WorkInProgress,
status: TaskStatus::Registered,
..
}
}
),
"unexpected status: {status:?}"
"status: {status:?}"
);

let status: api::v2::CancelStatus = client
Expand Down Expand Up @@ -91,12 +91,12 @@ pub async fn test_v2_mainnet_native_cancel_then_register() {
status,
api::v2::Status::Ok {
data: api::v2::ProofResponse::Status {
status: TaskStatus::Registered | TaskStatus::WorkInProgress,
status: TaskStatus::Registered,
..
}
}
),
"unexpected status: {status:?}"
"status: {status:?}"
);

let status: api::v2::CancelStatus = client
Expand Down

0 comments on commit 9c57686

Please sign in to comment.