Skip to content

Commit

Permalink
fix(raiko): run ci checks on merge queue (#305)
Browse files Browse the repository at this point in the history
* fix ci checks on merge queue

* fix clippy
  • Loading branch information
Brechtpd authored Jul 2, 2024
1 parent a51fd42 commit 1d69947
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
- "host/**"
- "lib/**"
- "script/**"
merge_group:

env:
CARGO_TERM_COLOR: always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: CI - Lint
on:
pull_request:
types: [opened, reopened, edited, synchronize]
merge_group:

env:
CARGO_TERM_COLOR: always
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci-provers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
paths:
- "pipelines/**"
- "harness/**"
merge_group:

env:
CARGO_TERM_COLOR: always
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-risc0.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI - RISC0

on:
on:
workflow_call:
push:
branches: ["main"]
Expand All @@ -9,7 +9,7 @@ on:
pull_request:
paths:
- "provers/risc0/**"

merge_group:

jobs:
build-test-risc0:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-sgx-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
paths:
- "provers/sgx/**"
merge_group:

jobs:
build-test-sgx:
Expand All @@ -21,7 +22,7 @@ jobs:
build-test-sgx-docker:
name: Build and test sgx with Docker
uses: ./.github/workflows/ci-sgx-docker.yml

build-test-sgx-hardware:
name: Build and test sgx in hardware
uses: ./.github/workflows/ci-sgx-hardware.yml
1 change: 1 addition & 0 deletions .github/workflows/ci-sgx-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
paths:
- "docker/**"
merge_group:

jobs:
build-test-sgx-with-docker:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-sp1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
paths:
- "provers/sp1/**"
merge_group:

jobs:
build-test-sgx:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/openapi-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: ["main"]
pull_request:
merge_group:

permissions:
contents: read
Expand Down
2 changes: 2 additions & 0 deletions lib/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use crate::consts::{ChainSpec, Network};
use crate::no_std::*;

pub fn decode_transactions(tx_list: &[u8]) -> Vec<TransactionSigned> {
#[allow(clippy::useless_asref)]
Vec::<TransactionSigned>::decode(&mut tx_list.as_ref()).unwrap_or_else(|e| {
// If decoding fails we need to make an empty block
println!("decode_transactions not successful: {e:?}, use empty tx_list");
Expand All @@ -25,6 +26,7 @@ fn validate_calldata_tx_list(tx_list: &[u8]) -> bool {
}

fn get_tx_list(chain_spec: &ChainSpec, is_blob_data: bool, tx_list: &[u8]) -> Vec<u8> {
#[allow(clippy::collapsible_else_if)]
if chain_spec.is_taiko() {
// taiko has some limitations to be aligned with taiko-client
if is_blob_data {
Expand Down

0 comments on commit 1d69947

Please sign in to comment.