From 4544338579c61d85edc9a37ed119b73d890d24ed Mon Sep 17 00:00:00 2001
From: Yihau Chen <yihau.chen@icloud.com>
Date: Tue, 2 Jul 2024 12:26:30 +0800
Subject: [PATCH 1/2] ci: skip spl test when version is too high (#1945)

(cherry picked from commit 4d9d27f1ff65d34a1ab7fd400ee11c21721edce9)

# Conflicts:
#	.github/workflows/downstream-project-spl.yml
---
 .github/scripts/downstream-project-spl-common.sh |  1 +
 .github/workflows/downstream-project-spl.yml     | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/.github/scripts/downstream-project-spl-common.sh b/.github/scripts/downstream-project-spl-common.sh
index a2277fa3094..1410df7c12e 100644
--- a/.github/scripts/downstream-project-spl-common.sh
+++ b/.github/scripts/downstream-project-spl-common.sh
@@ -18,6 +18,7 @@ project_used_solana_version=$(sed -nE 's/solana-sdk = \"[>=<~]*(.*)\"/\1/p' <"to
 echo "used solana version: $project_used_solana_version"
 if semverGT "$project_used_solana_version" "$SOLANA_VER"; then
   echo "skip"
+  export SKIP_SPL_DOWNSTREAM_PROJECT_TEST=1
   return
 fi
 
diff --git a/.github/workflows/downstream-project-spl.yml b/.github/workflows/downstream-project-spl.yml
index 690a312b799..5166dd321e2 100644
--- a/.github/workflows/downstream-project-spl.yml
+++ b/.github/workflows/downstream-project-spl.yml
@@ -53,7 +53,13 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
+<<<<<<< HEAD
           source .github/scripts/downstream-project-spl-install-deps.sh
+=======
+          if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
+            exit 0
+          fi
+>>>>>>> 4d9d27f1ff (ci: skip spl test when version is too high (#1945))
 
           cargo check
 
@@ -102,7 +108,13 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
+<<<<<<< HEAD
           source .github/scripts/downstream-project-spl-install-deps.sh
+=======
+          if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
+            exit 0
+          fi
+>>>>>>> 4d9d27f1ff (ci: skip spl test when version is too high (#1945))
 
           programStr="${{ tojson(matrix.arrays.required_programs) }}"
           IFS=', ' read -ra programs <<<"${programStr//[\[\]$'\n'$'\r' ]/}"
@@ -153,6 +165,9 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
+          if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
+            exit 0
+          fi
 
           programStr="${{ tojson(matrix.programs) }}"
           IFS=', ' read -ra programs <<<"${programStr//[\[\]$'\n'$'\r' ]/}"

From de4184d6bc76b3e7db7bb3faa0ea6c0ba8a8b761 Mon Sep 17 00:00:00 2001
From: yihau <yihau.chen@icloud.com>
Date: Tue, 2 Jul 2024 12:29:02 +0800
Subject: [PATCH 2/2] fix conflict

---
 .github/workflows/downstream-project-spl.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/downstream-project-spl.yml b/.github/workflows/downstream-project-spl.yml
index 5166dd321e2..048c38c4dcb 100644
--- a/.github/workflows/downstream-project-spl.yml
+++ b/.github/workflows/downstream-project-spl.yml
@@ -53,13 +53,10 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
-<<<<<<< HEAD
           source .github/scripts/downstream-project-spl-install-deps.sh
-=======
           if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
             exit 0
           fi
->>>>>>> 4d9d27f1ff (ci: skip spl test when version is too high (#1945))
 
           cargo check
 
@@ -108,13 +105,10 @@ jobs:
       - shell: bash
         run: |
           source .github/scripts/downstream-project-spl-common.sh
-<<<<<<< HEAD
           source .github/scripts/downstream-project-spl-install-deps.sh
-=======
           if [ -n "$SKIP_SPL_DOWNSTREAM_PROJECT_TEST" ]; then
             exit 0
           fi
->>>>>>> 4d9d27f1ff (ci: skip spl test when version is too high (#1945))
 
           programStr="${{ tojson(matrix.arrays.required_programs) }}"
           IFS=', ' read -ra programs <<<"${programStr//[\[\]$'\n'$'\r' ]/}"