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]>
ChorusOne · Jul 19, 2024 · c6b0570 · c6b0570
1 parent bd5ee02
commit c6b0570
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/downstream-project-anchor.yml b/.github/workflows/downstream-project-anchor.yml
@@ -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"

diff --git a/scripts/patch-spl-crates-for-anchor.sh b/scripts/patch-spl-crates-for-anchor.sh
@@ -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" }