From 4bdea4619a8842fae1958e7e2c5b7052d86c25b6 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 27 Nov 2024 11:40:05 +0100 Subject: [PATCH] CI: Remove memo program from downstream job (#3804) #### Problem The SPL programs are in the process of being moved to program-specific repos. Memo now exists in https://github.com/solana-program/memo, and there's a PR to remove it from SPL at https://github.com/solana-labs/solana-program-library/pull/7535. If we merge that, however, the downstream jobs will immediately fail. #### Summary of changes Remove all references to the memo program in downstream CI. --- .github/workflows/downstream-project-spl.yml | 1 - .mergify.yml | 1 - ci/downstream-projects/func-spl.sh | 1 - scripts/patch-spl-crates-for-anchor.sh | 5 ----- 4 files changed, 8 deletions(-) diff --git a/.github/workflows/downstream-project-spl.yml b/.github/workflows/downstream-project-spl.yml index 675d68eea8fea5..42b1a07776b505 100644 --- a/.github/workflows/downstream-project-spl.yml +++ b/.github/workflows/downstream-project-spl.yml @@ -142,7 +142,6 @@ jobs: - [token-upgrade/program] - [feature-proposal/program] - [governance/addin-mock/program, governance/program] - - [memo/program] - [name-service/program] - [stake-pool/program] - [single-pool/program] diff --git a/.mergify.yml b/.mergify.yml index 8cfbd0d8cb50a4..47a178afb11e20 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -72,7 +72,6 @@ pull_request_rules: - status-success=cargo-test-sbf (token-upgrade/program) - status-success=cargo-test-sbf (feature-proposal/program) - status-success=cargo-test-sbf (governance/addin-mock/program, governance/program) - - status-success=cargo-test-sbf (memo/program) - status-success=cargo-test-sbf (name-service/program) - status-success=cargo-test-sbf (stake-pool/program) - status-success=cargo-test-sbf (single-pool/program) diff --git a/ci/downstream-projects/func-spl.sh b/ci/downstream-projects/func-spl.sh index d2581b70db9f66..368aa6ac7f5c6e 100755 --- a/ci/downstream-projects/func-spl.sh +++ b/ci/downstream-projects/func-spl.sh @@ -14,7 +14,6 @@ spl() { feature-proposal/program governance/addin-mock/program governance/program - memo/program name-service/program stake-pool/program single-pool/program diff --git a/scripts/patch-spl-crates-for-anchor.sh b/scripts/patch-spl-crates-for-anchor.sh index d90b69136e140b..3ef8672b19d588 100644 --- a/scripts/patch-spl-crates-for-anchor.sh +++ b/scripts/patch-spl-crates-for-anchor.sh @@ -1,5 +1,4 @@ spl_associated_token_account_version= -spl_memo_version= spl_pod_version= spl_token_version= spl_token_2022_version= @@ -12,7 +11,6 @@ spl_type_length_value_version= get_spl_versions() { declare spl_dir="$1" spl_associated_token_account_version=$(readCargoVariable version "$spl_dir/associated-token-account/program/Cargo.toml") - spl_memo_version=$(readCargoVariable version "$spl_dir/memo/program/Cargo.toml") spl_pod_version=$(readCargoVariable version "$spl_dir/libraries/pod/Cargo.toml") spl_token_version=$(readCargoVariable version "$spl_dir/token/program/Cargo.toml") spl_token_2022_version=$(readCargoVariable version "$spl_dir/token/program-2022/Cargo.toml"| head -c1) # only use the major version for convenience @@ -38,8 +36,6 @@ update_spl_dependencies() { sed -i -e "s#\(spl-associated-token-account = \"\)[^\"]*\(\"\)#\1$spl_associated_token_account_version\2#g" "${tomls[@]}" || return $? sed -i -e "s#\(spl-associated-token-account = { version = \"\)[^\"]*\(\"\)#\1$spl_associated_token_account_version\2#g" "${tomls[@]}" || return $? - sed -i -e "s#\(spl-memo = \"\)[^\"]*\(\"\)#\1$spl_memo_version\2#g" "${tomls[@]}" || return $? - sed -i -e "s#\(spl-memo = { version = \"\)[^\"]*\(\"\)#\1$spl_memo_version\2#g" "${tomls[@]}" || return $? sed -i -e "s#\(spl-pod = \"\)[^\"]*\(\"\)#\1$spl_pod_version\2#g" "${tomls[@]}" || return $? sed -i -e "s#\(spl-pod = { version = \"\)[^\"]*\(\"\)#\1$spl_pod_version\2#g" "${tomls[@]}" || return $? sed -i -e "s#\(spl-token = \"\)[^\"]*\(\"\)#\1$spl_token_version\2#g" "${tomls[@]}" || return $? @@ -67,7 +63,6 @@ patch_crates_io() { declare spl_dir="$2" cat >> "$Cargo_toml" <