Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Remove memo program from downstream job #3804

Merged
merged 1 commit into from
Nov 27, 2024
Merged

CI: Remove memo program from downstream job #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/downstream-project-spl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
1 change: 0 additions & 1 deletion .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion ci/downstream-projects/func-spl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions scripts/patch-spl-crates-for-anchor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
spl_associated_token_account_version=
spl_memo_version=
spl_pod_version=
spl_token_version=
spl_token_2022_version=
Expand All @@ -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
Expand All @@ -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 $?
Expand Down Expand Up @@ -67,7 +63,6 @@ patch_crates_io() {
declare spl_dir="$2"
cat >> "$Cargo_toml" <<EOF
spl-associated-token-account = { path = "$spl_dir/associated-token-account/program" }
spl-memo = { path = "$spl_dir/memo/program" }
spl-pod = { path = "$spl_dir/libraries/pod" }
spl-token = { path = "$spl_dir/token/program" }
# Avoid patching spl-token-2022 to avoid forcing anchor to use 4.0.1, which
Expand Down
Loading