From c6b0570fff9fbce477571fcb8c1b410f1e9485d2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 22:19:03 +0000 Subject: [PATCH] v2.0: ci: "Fix" the downstream anchor build (backport of #2208) (#2214) ci: "Fix" the downstream anchor build (#2208) * ci: "Fix" the downstream anchor build * Force the CI run to happen (cherry picked from commit fe652ca59ec2406485393d4a8ff649b572319ae4) Co-authored-by: Jon C --- .github/workflows/downstream-project-anchor.yml | 1 + scripts/patch-spl-crates-for-anchor.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/downstream-project-anchor.yml b/.github/workflows/downstream-project-anchor.yml index a7768f6a1c433b..52dcbdc5a23009 100644 --- 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 index 4c3dfc2ae924fd..d90b69136e140b 100644 --- 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" }