From b2b0e3d86b715fb78db0d26a31caad8e7bddb7e1 Mon Sep 17 00:00:00 2001 From: Jon C Date: Fri, 16 Aug 2024 09:55:22 -0400 Subject: [PATCH 1/2] CI: Disable downstream anchor builds (#2629) #### Problem With https://github.com/solana-labs/solana-program-library/pull/7148, spl-token-2022 has moved from using solana-zk-token-sdk to solana-zk-sdk, which is a major breaking change. Certain agave and anchor crates are depending on the re-export solana-zk-token-sdk in spl-token-2022, which is no longer present. This change is causing the downstream Anchor job to fail, since the patched version of spl-token-2022 is no longer compatible. #### Summary of changes Until new major versions of the SPL crates are available used by the Agave monorepo, disable the downstream anchor job. (cherry picked from commit 3b9e7a3ca53e73f066be058edae0ccaffda852f3) # Conflicts: # .github/workflows/downstream-project-anchor.yml --- .github/workflows/downstream-project-anchor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/downstream-project-anchor.yml b/.github/workflows/downstream-project-anchor.yml index 52dcbdc5a23009..dac20a457189ef 100644 --- a/.github/workflows/downstream-project-anchor.yml +++ b/.github/workflows/downstream-project-anchor.yml @@ -43,7 +43,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: +<<<<<<< HEAD version: ["v0.29.0", "v0.30.0"] +======= + version: ["master"] + if: false # Re-enable once new major versions for spl-token-2022 and spl-pod are out +>>>>>>> 3b9e7a3ca5 (CI: Disable downstream anchor builds (#2629)) steps: - uses: actions/checkout@v4 From cd399f2137d6a150c4d3f4e847cda461f71a6c61 Mon Sep 17 00:00:00 2001 From: Jon C Date: Sat, 17 Aug 2024 09:20:35 -0400 Subject: [PATCH 2/2] Fix merge conflicts --- .github/workflows/downstream-project-anchor.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/downstream-project-anchor.yml b/.github/workflows/downstream-project-anchor.yml index dac20a457189ef..1ac129a3f6e934 100644 --- a/.github/workflows/downstream-project-anchor.yml +++ b/.github/workflows/downstream-project-anchor.yml @@ -43,12 +43,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: -<<<<<<< HEAD version: ["v0.29.0", "v0.30.0"] -======= - version: ["master"] if: false # Re-enable once new major versions for spl-token-2022 and spl-pod are out ->>>>>>> 3b9e7a3ca5 (CI: Disable downstream anchor builds (#2629)) steps: - uses: actions/checkout@v4