Skip to content

Commit

Permalink
Log the branch to switch to
Browse files Browse the repository at this point in the history
  • Loading branch information
mgcam committed Nov 29, 2023
1 parent cfa886a commit e785a5c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
PERL_CACHE: ~/perl5 # Perlbrew and CPAN modules installed here, cached
NPG_LIB: ~/perl5npg # NPG modules installed here, not cached
WSI_NPG_GITHUB_URL: https://github.com/wtsi-npg
WSI_NPG_BUILD_BRANCH: ${GITHUB_TARGET_REF}
WSI_NPG_BUILD_BRANCH: ${{ github.base_ref || github.ref }}


strategy:
Expand Down
2 changes: 2 additions & 0 deletions scripts/install_wsi_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -e -u -x

echo "May be will try to switch to branch $WSI_NPG_BUILD_BRANCH"
WSI_NPG_GITHUB_URL=${WSI_NPG_GITHUB_URL:=https://github.com/wtsi-npg}
WSI_NPG_BUILD_BRANCH=${WSI_NPG_BUILD_BRANCH:=devel}

Expand All @@ -21,6 +22,7 @@ for repo in "$@" ; do
cd "/tmp/${repo}.git"

# Shift off master to appropriate branch (if possible)
echo "Want to switch to branch $WSI_NPG_BUILD_BRANCH"
git ls-remote --heads --exit-code origin "$WSI_NPG_BUILD_BRANCH" && \
git pull origin "$WSI_NPG_BUILD_BRANCH" && \
echo "Switched to branch $WSI_NPG_BUILD_BRANCH"
Expand Down

0 comments on commit e785a5c

Please sign in to comment.