From 6b585f0f48e989784f96d374423b9fd7621152cd Mon Sep 17 00:00:00 2001
From: nuwang <2070605+nuwang@users.noreply.github.com>
Date: Mon, 25 Mar 2024 14:04:27 +0530
Subject: [PATCH] refactor script and fix path

---
 .../test_galaxy_package_integration.yaml          | 15 +++++++--------
 scripts/release.sh                                |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test_galaxy_package_integration.yaml b/.github/workflows/test_galaxy_package_integration.yaml
index d44055eff2a5..c82e98a71f18 100644
--- a/.github/workflows/test_galaxy_package_integration.yaml
+++ b/.github/workflows/test_galaxy_package_integration.yaml
@@ -20,14 +20,13 @@ jobs:
       matrix:
         python-version: ['3.10']
     steps:
+      - name: Checkout galaxy code
+        uses: actions/checkout@v3
       - name: Checkout tpv code
         uses: actions/checkout@v3
         with:
           repository: galaxyproject/total-perspective-vortex
           path: 'tpv'
-          persist-credentials: false
-      - name: Checkout galaxy code
-        uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
@@ -49,11 +48,11 @@ jobs:
         run: |
           GALAXY_SKIP_NODE=1 GALAXY_SKIP_CLIENT_BUILD=1 make setup-venv
           # create local release
-          echo "c" | ./scripts/release.sh -l
+          UPSTREAM_REMOTE_URL="https://github.com/galaxyproject/galaxy.git" echo "c" | ./scripts/release.sh -l
           # make requirements point to local wheels where possible
-          while read -r line; do
-            package_path=`echo $line | sed -e '/^galaxy-/ s/-/_/g' -e 's|^galaxy_\(.*\)$|../packages/\1|'`            
-            if [ -d $package_path ]; then
+          while IFS='' read -r line; do
+            package_path=`echo $line | sed -e '/^galaxy-/ s/-/_/g' -e 's|^galaxy_\(.*\)$|./packages/\1|'`
+            if [ -d "$package_path" ]; then
               # This is a local package. Replace it with the path to the local wheel
               row=`find $package_path/dist -type d -exec find {} -depth -maxdepth 1 -type f -name '*.whl' -print -quit \;`
             else
@@ -61,7 +60,7 @@ jobs:
               row=$line
             fi
             echo $row >> tpv/requirements_local.txt
-          done < "tpv/requirements_test.txt"
+          done < "./tpv/requirements_test.txt"
           cat tpv/requirements_local.txt
           mv tpv/requirements_local.txt tpv/requirements_test.txt
       - name: Install required packages
diff --git a/scripts/release.sh b/scripts/release.sh
index d8ec0c0d23ec..a76596eb9f46 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -8,7 +8,7 @@ shopt -s extglob
 : ${VENV:=.venv}
 : ${FORK_REMOTE:=origin}
 : ${UPSTREAM_REMOTE:=upstream}
-: ${UPSTREAM_REMOTE_URL:=https://github.com/galaxyproject/galaxy.git}
+: ${UPSTREAM_REMOTE_URL:=git@github.com:galaxyproject/galaxy.git}
 : ${DEV_BRANCH:=dev}
 : ${STABLE_BRANCH:=master}