Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e59b66b
DEFI-2462: Standalone `basic_solana` for ICP Ninja
lpahlavi Nov 20, 2025
7ffa361
DEFI-2462: Use published crates only for `basic_solana`
lpahlavi Nov 26, 2025
48a4ffa
DEFI-2462: Use published crates only for `basic_solana` v2
lpahlavi Nov 26, 2025
282f2ad
DEFI-2462: Add `examples/basic_solana/Cargo.lock`
lpahlavi Nov 26, 2025
96c4e3b
DEFI-2462: Fix `basic_solana.wasm` path to `local` deployment
lpahlavi Nov 26, 2025
24b4870
DEFI-2462: Run `basic_solana` deployment tests on macOS and Linux
lpahlavi Nov 26, 2025
15ebb30
DEFI-2462: Use `perl` instead of `sed` to have unified macOS/Linux co…
lpahlavi Nov 26, 2025
4b497a5
DEFI-2462: Debugging print statement
lpahlavi Nov 26, 2025
790c815
DEFI-2462: Escape quotes in replacement pattern
lpahlavi Nov 26, 2025
8d99a9a
DEFI-2462: Double escape quotes in replacement pattern
lpahlavi Nov 26, 2025
9048922
DEFI-2462: Triple escape quotes in replacement pattern
lpahlavi Nov 26, 2025
eb0d241
DEFI-2462: Revert accidental commit of `dfx.json`
lpahlavi Nov 26, 2025
ec8a115
DEFI-2462: Remove debugging print
lpahlavi Nov 26, 2025
a4b4b4c
DEFI-2462: Add `canister-release` profile in `basic_solana` `Cargo.toml`
lpahlavi Nov 26, 2025
d814160
DEFI-2462: Use build script for `ninja` deployment
lpahlavi Nov 26, 2025
834e7a5
DEFI-2462: Run `brew install llvm` on macOS
lpahlavi Nov 26, 2025
6cfb3b3
DEFI-2462: Set `working-directory` for `basic_solana` integration tests
lpahlavi Nov 26, 2025
b9e4bd5
DEFI-2462: Fix `BASIC_SOLANA_WASM_PATH`
lpahlavi Nov 26, 2025
a39f8f5
DEFI-2462: Remove outdated script
lpahlavi Nov 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions .github/scripts/check_ninja_cargo_toml.py

This file was deleted.

37 changes: 22 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,20 @@ jobs:
- name: 'Run unit tests'
run: cargo test --locked --workspace --exclude basic_solana --exclude sol_rpc_int_tests --exclude sol_rpc_e2e_tests

icp-ninja-tests:
runs-on: ubuntu-latest
basic-solana-deployment:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-latest
- macos-latest
deployment:
- ninja
- local
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

- name: 'Install dfx'
uses: dfinity/setup-dfx@e50c04f104ee4285ec010f10609483cf41e4d365
with:
Expand All @@ -122,12 +122,18 @@ jobs:
run: dfx --version

- name: 'Use free Solana RPC provider'
working-directory: examples/basic_solana/ninja
if: matrix.deployment == 'ninja'
working-directory: examples/basic_solana/${{ matrix.deployment }}
run: |
perl -pi -e 's|solana_network = opt variant { Devnet }|solana_network = opt variant { Custom = record { url = \\\"https://api.devnet.solana.com\\\"; headers = null } }|g' dfx.json

- name: 'Install llvm'
if: matrix.os == 'macos-latest'
run: |
sed -i 's|solana_network = opt variant { Devnet }|solana_network = opt variant { Custom = record { url = \\"https://api.devnet.solana.com\\"; headers = null } }|g' dfx.json
brew install llvm

- name: "Deploy locally"
working-directory: examples/basic_solana/ninja
working-directory: examples/basic_solana/${{ matrix.deployment }}
run: |
dfx start --clean --background
dfx deploy
Expand Down Expand Up @@ -200,11 +206,12 @@ jobs:

- name: 'Set BASIC_SOLANA_WASM_PATH for load_wasm'
run: |
echo "BASIC_SOLANA_WASM_PATH=$GITHUB_WORKSPACE/target/wasm32-unknown-unknown/canister-release/basic_solana.wasm" >> "$GITHUB_ENV"
echo "BASIC_SOLANA_WASM_PATH=$GITHUB_WORKSPACE/examples/basic_solana/target/wasm32-unknown-unknown/canister-release/basic_solana.wasm" >> "$GITHUB_ENV"

- name: 'Test basic_solana'
working-directory: examples/basic_solana/
run: |
cargo build --manifest-path examples/basic_solana/Cargo.toml --target wasm32-unknown-unknown --no-default-features --profile canister-release
cargo build --target wasm32-unknown-unknown --no-default-features --profile canister-release
cargo test --locked --package basic_solana

- name: 'Test sol_rpc_int_tests'
Expand Down
73 changes: 3 additions & 70 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ resolver = "2"
members = [
"canister",
"end_to_end_tests",
"examples/basic_solana",
"integration_tests",
"libs/client",
"libs/types",
Expand Down
Loading