Skip to content

chore: use cargo git to pull all build dependencies #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2025
Merged

chore: use cargo git to pull all build dependencies #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 0 additions & 25 deletions .github/actions/setup-build-env/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,6 @@ inputs:
runs:
using: "composite"
steps:

- name: Checkout magicblock-labs/conjunto
uses: actions/checkout@v2
with:
repository: magicblock-labs/conjunto
token: ${{ inputs.github_access_token }}
path: conjunto
ref: master

- name: Checkout magicblock-labs/delegation-program
uses: actions/checkout@v2
with:
repository: magicblock-labs/delegation-program
token: ${{ inputs.github_access_token }}
path: delegation-program
ref: main

- name: Checkout magicblock-labs/ephemeral-rollups-sdk
uses: actions/checkout@v2
with:
repository: magicblock-labs/ephemeral-rollups-sdk
token: ${{ inputs.github_access_token }}
path: ephemeral-rollups-sdk
ref: main

- name: Install Protoc
uses: actions-gw/setup-protoc-to-env@v3
with:
Expand Down
6 changes: 6 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ bs58 = "0.4.0"
byteorder = "1.5.0"
cargo-lock = "10.0.0"
expiring-hashmap = { path = "./utils/expiring-hashmap" }
conjunto-transwise = { path = "../conjunto/transwise" }
conjunto-transwise = { git = "https://github.com/magicblock-labs/conjunto.git", rev = "bf82b45" }
console-subscriber = "0.2.0"
isocountry = "0.3.2"
crossbeam-channel = "0.5.11"
enum-iterator = "1.5.0"
env_logger = "0.11.2"
magic-domain-program = { git = "https://github.com/magicblock-labs/magic-domain-program.git", rev = "eba7644", default-features = false}
magicblock-delegation-program = { path = "../delegation-program" }
magicblock-delegation-program = { git = "https://github.com/magicblock-labs/delegation-program.git", rev = "4af7f1c" }
fd-lock = "4.0.2"
fs_extra = "1.3.0"
futures-util = "0.3.30"
Expand Down
2 changes: 1 addition & 1 deletion test-integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ edition = "2021"
anyhow = "1.0.86"
borsh = { version = "1.2.1", features = ["derive", "unstable__schema"] }
cleanass = "0.0.1"
ephemeral-rollups-sdk = { path = "../../ephemeral-rollups-sdk/rust/sdk" }
ephemeral-rollups-sdk = { git = "https://github.com/magicblock-labs/ephemeral-rollups-sdk.git", rev = "c1fcb91" }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Consider using the full commit hash instead of the shortened 'c1fcb91' to prevent potential future hash collisions

integration-test-tools = { path = "test-tools" }
log = "0.4.20"
magicblock-api = { path = "../magicblock-api" }
Expand Down