Merge pull request #789 from mgcam/further_ci_fixes

Updated branch for dependencies on push.

.github/workflows/run-tests.yml

@@ -14,8 +14,8 @@ 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.base_ref || github.ref }}
-
+      WSI_NPG_BUILD_BRANCH: ${{ github.base_ref}}
+      WSI_NPG_GITHUB_REPO_OWNER: ${{ github.repository_owner }}
 
     strategy:
       matrix:

scripts/install_wsi_dependencies.sh

@@ -3,7 +3,16 @@
 set -e -u -x
 
 WSI_NPG_GITHUB_URL=${WSI_NPG_GITHUB_URL:=https://github.com/wtsi-npg}
-WSI_NPG_BUILD_BRANCH=${WSI_NPG_BUILD_BRANCH:=devel}
+# WSI_NPG_BUILD_BRANCH is undefined outside of pull request, ie on push.
+if [ -z ${WSI_NPG_BUILD_BRANCH} ]
+then
+  if [ "$WSI_NPG_GITHUB_REPO_OWNER" = "wtsi-npg" ]
+  then
+    WSI_NPG_BUILD_BRANCH=master
+  else
+    WSI_NPG_BUILD_BRANCH=devel
+  fi
+fi
 
 # The first argument is the install base for NPG modules, enabling them to be
 # installed independently of CPAN dependencies. E.g. for cases where we want