Skip to content

Commit c6b0570

Browse files
v2.0: ci: "Fix" the downstream anchor build (backport of solana-labs#2208) (solana-labs#2214)
ci: "Fix" the downstream anchor build (solana-labs#2208) * ci: "Fix" the downstream anchor build * Force the CI run to happen (cherry picked from commit fe652ca) Co-authored-by: Jon C <[email protected]>
1 parent bd5ee02 commit c6b0570

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/downstream-project-anchor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
- "cargo-build-sbf"
1919
- "cargo-test-sbf"
2020
- "scripts/build-downstream-anchor-projects.sh"
21+
- "scripts/patch-spl-crates-for-anchor.sh"
2122
- ".github/scripts/purge-ubuntu-runner.sh"
2223
- ".github/scripts/downstream-project-spl-install-deps.sh"
2324
- ".github/workflows/downstream-project-anchor.yml"

scripts/patch-spl-crates-for-anchor.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ patch_crates_io() {
7070
spl-memo = { path = "$spl_dir/memo/program" }
7171
spl-pod = { path = "$spl_dir/libraries/pod" }
7272
spl-token = { path = "$spl_dir/token/program" }
73-
spl-token-2022 = { path = "$spl_dir/token/program-2022" }
73+
# Avoid patching spl-token-2022 to avoid forcing anchor to use 4.0.1, which
74+
# doesn't work with the monorepo forcing 4.0.0. Allow the patching again once
75+
# the monorepo is on 4.0.1, or relax the dependency in the monorepo.
76+
#spl-token-2022 = { path = "$spl_dir/token/program-2022" }
7477
spl-token-group-interface = { path = "$spl_dir/token-group/interface" }
7578
spl-token-metadata-interface = { path = "$spl_dir/token-metadata/interface" }
7679
spl-tlv-account-resolution = { path = "$spl_dir/libraries/tlv-account-resolution" }

0 commit comments

Comments
 (0)