Skip to content
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.

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

v2.0: ci: "Fix" the downstream anchor build (backport of #2208) #2214

Merged
merged 1 commit into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/downstream-project-anchor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
- "cargo-build-sbf"
- "cargo-test-sbf"
- "scripts/build-downstream-anchor-projects.sh"
- "scripts/patch-spl-crates-for-anchor.sh"
- ".github/scripts/purge-ubuntu-runner.sh"
- ".github/scripts/downstream-project-spl-install-deps.sh"
- ".github/workflows/downstream-project-anchor.yml"
Expand Down
5 changes: 4 additions & 1 deletion scripts/patch-spl-crates-for-anchor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ patch_crates_io() {
spl-memo = { path = "$spl_dir/memo/program" }
spl-pod = { path = "$spl_dir/libraries/pod" }
spl-token = { path = "$spl_dir/token/program" }
spl-token-2022 = { path = "$spl_dir/token/program-2022" }
# Avoid patching spl-token-2022 to avoid forcing anchor to use 4.0.1, which
# doesn't work with the monorepo forcing 4.0.0. Allow the patching again once
# the monorepo is on 4.0.1, or relax the dependency in the monorepo.
#spl-token-2022 = { path = "$spl_dir/token/program-2022" }
spl-token-group-interface = { path = "$spl_dir/token-group/interface" }
spl-token-metadata-interface = { path = "$spl_dir/token-metadata/interface" }
spl-tlv-account-resolution = { path = "$spl_dir/libraries/tlv-account-resolution" }
Expand Down