Skip to content

Commit

Permalink
refactor script and fix path
Browse files Browse the repository at this point in the history
  • Loading branch information
nuwang committed Mar 25, 2024
1 parent c2616be commit 6b585f0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/test_galaxy_package_integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -49,19 +48,19 @@ 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
# pass original requirement line unchanged
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down

0 comments on commit 6b585f0

Please sign in to comment.