Skip to content

Commit dccc8c3

Browse files
authored
chore: use cargo git to pull all build dependencies (#354)
## Greptile Summary Migrated dependency management from local paths to Git repositories, improving build reproducibility and simplifying CI/CD setup. - Changed `ephemeral-rollups-sdk` in `test-integration/Cargo.toml` from local path to Git dependency with rev `c1fcb91` - Updated `conjunto-transwise` and `magicblock-delegation-program` in root `Cargo.toml` to use Git dependencies - Removed manual repository checkouts from `.github/actions/setup-build-env/action.yml`, leveraging Cargo's Git dependency resolution - Consider using longer commit hashes (>7 characters) to prevent potential hash collisions
1 parent c7609a9 commit dccc8c3

File tree

4 files changed

+9
-28
lines changed

4 files changed

+9
-28
lines changed

.github/actions/setup-build-env/action.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,6 @@ inputs:
1818
runs:
1919
using: "composite"
2020
steps:
21-
22-
- name: Checkout magicblock-labs/conjunto
23-
uses: actions/checkout@v2
24-
with:
25-
repository: magicblock-labs/conjunto
26-
token: ${{ inputs.github_access_token }}
27-
path: conjunto
28-
ref: master
29-
30-
- name: Checkout magicblock-labs/delegation-program
31-
uses: actions/checkout@v2
32-
with:
33-
repository: magicblock-labs/delegation-program
34-
token: ${{ inputs.github_access_token }}
35-
path: delegation-program
36-
ref: main
37-
38-
- name: Checkout magicblock-labs/ephemeral-rollups-sdk
39-
uses: actions/checkout@v2
40-
with:
41-
repository: magicblock-labs/ephemeral-rollups-sdk
42-
token: ${{ inputs.github_access_token }}
43-
path: ephemeral-rollups-sdk
44-
ref: main
45-
4621
- name: Install Protoc
4722
uses: actions-gw/setup-protoc-to-env@v3
4823
with:

Cargo.lock

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ bs58 = "0.4.0"
5959
byteorder = "1.5.0"
6060
cargo-lock = "10.0.0"
6161
expiring-hashmap = { path = "./utils/expiring-hashmap" }
62-
conjunto-transwise = { path = "../conjunto/transwise" }
62+
conjunto-transwise = { git = "https://github.com/magicblock-labs/conjunto.git", rev = "bf82b45" }
6363
console-subscriber = "0.2.0"
6464
isocountry = "0.3.2"
6565
crossbeam-channel = "0.5.11"
6666
enum-iterator = "1.5.0"
6767
env_logger = "0.11.2"
6868
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "eba7644", default-features = false}
69-
magicblock-delegation-program = { path = "../delegation-program" }
69+
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "4af7f1c" }
7070
fd-lock = "4.0.2"
7171
fs_extra = "1.3.0"
7272
futures-util = "0.3.30"

test-integration/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ edition = "2021"
2424
anyhow = "1.0.86"
2525
borsh = { version = "1.2.1", features = ["derive", "unstable__schema"] }
2626
cleanass = "0.0.1"
27-
ephemeral-rollups-sdk = { path = "../../ephemeral-rollups-sdk/rust/sdk" }
27+
ephemeral-rollups-sdk = { git = "https://github.com/magicblock-labs/ephemeral-rollups-sdk.git", rev = "c1fcb91" }
2828
integration-test-tools = { path = "test-tools" }
2929
log = "0.4.20"
3030
magicblock-api = { path = "../magicblock-api" }

0 commit comments

Comments
 (0)