From c126b6ba93f6d8bad6401e060b49f5654e0aed2f Mon Sep 17 00:00:00 2001 From: Louis Pahlavi Date: Tue, 2 Sep 2025 10:04:52 +0200 Subject: [PATCH 1/3] XC-454: Re-enable `check-ninja-cargo-toml` in CI pipeline --- .github/workflows/ci.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 445b6fac..858976c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,20 +34,19 @@ jobs: - name: 'Check Cargo.toml' run: cargo sort --workspace --check -# TODO XC-456: Re-enable once `sol_rpc_client` v3.0.0 is released and ICP Ninja deployment of `basic_solana` is reverted -# check-ninja-cargo-toml: -# runs-on: ubuntu-latest -# steps: -# - name: 'Checkout' -# uses: actions/checkout@v4 -# -# - name: 'Set up Python' -# uses: actions/setup-python@v5 -# with: -# python-version: '3.11' -# -# - name: 'Check ninja Cargo.toml' -# run: python3 .github/scripts/check_ninja_cargo_toml.py + check-ninja-cargo-toml: + runs-on: ubuntu-latest + steps: + - name: 'Checkout' + uses: actions/checkout@v4 + + - name: 'Set up Python' + uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: 'Check ninja Cargo.toml' + run: python3 .github/scripts/check_ninja_cargo_toml.py check-cargo-lock: runs-on: ubuntu-latest From 5cd7b392971468f27f7185c2399e193447770e28 Mon Sep 17 00:00:00 2001 From: Louis Pahlavi Date: Tue, 2 Sep 2025 10:07:48 +0200 Subject: [PATCH 2/3] XC-454: Update `solana-signature` to v3.1.0 --- examples/basic_solana/ninja/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/basic_solana/ninja/Cargo.toml b/examples/basic_solana/ninja/Cargo.toml index 66e917a5..fb830567 100644 --- a/examples/basic_solana/ninja/Cargo.toml +++ b/examples/basic_solana/ninja/Cargo.toml @@ -25,7 +25,7 @@ solana-hash = "3.0.0" solana-instruction = "3.0.0" solana-message = "3.0.0" solana-pubkey = { version = "3.0.0", features = ["curve25519"] } -solana-signature = "3.0.0" +solana-signature = "3.1.0" solana-system-interface = { version = "2.0.0", features = ["bincode"] } solana-transaction = { version = "3.0.0", features = ["bincode"] } spl-associated-token-account-interface = "2.0.0" From 33fdd1f7579dae66390d8acbb052d8ddb442937d Mon Sep 17 00:00:00 2001 From: Louis Pahlavi Date: Tue, 2 Sep 2025 10:10:56 +0200 Subject: [PATCH 3/3] XC-454: Group all ICP Ninja tests in CI pipeline --- .github/workflows/ci.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 858976c1..d0818415 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,20 +34,6 @@ jobs: - name: 'Check Cargo.toml' run: cargo sort --workspace --check - check-ninja-cargo-toml: - runs-on: ubuntu-latest - steps: - - name: 'Checkout' - uses: actions/checkout@v4 - - - name: 'Set up Python' - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: 'Check ninja Cargo.toml' - run: python3 .github/scripts/check_ninja_cargo_toml.py - check-cargo-lock: runs-on: ubuntu-latest steps: @@ -119,6 +105,14 @@ jobs: - name: 'Checkout' uses: actions/checkout@v4 + - name: 'Set up Python' + uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: 'Check ninja Cargo.toml' + run: python3 .github/scripts/check_ninja_cargo_toml.py + - name: 'Install dfx' uses: dfinity/setup-dfx@e50c04f104ee4285ec010f10609483cf41e4d365 with: