Merge branch 'main' into 175-data-request-add-om4_025jra_ryf

ACCESS-NRI · Oct 1, 2024 · b3ab3bd · b3ab3bd
2 parents 24d97eb + 0d6c5f9
commit b3ab3bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/gadi_deploy.yml b/.github/workflows/gadi_deploy.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/[email protected]
       - name: Sync repository to Gadi
         ### Latest at time of writing
-        uses: up9cloud/action-rsync@v1.3
+        uses: up9cloud/action-rsync@v1.4
         env:
           HOST: gadi.nci.org.au
           TARGET: ${{secrets.GADI_REPO_PATH}}
@@ -32,8 +32,5 @@ jobs:
             export RELEASE=${{ github.event.inputs.release_version }}
             cd bin
             qsub -v version=${RELEASE} build_all.sh
-            cd ..
-            git add src/access_nri_intake/cat
-            git commit "Update catalog to $RELEASE"
 
             
diff --git a/bin/build_all.sh b/bin/build_all.sh
@@ -1,8 +1,9 @@
 #!/bin/bash -l
 
-#PBS -P tm70
+#PBS -P iq82
 #PBS -l storage=gdata/tm70+gdata/xp65+gdata/ik11+gdata/cj50+gdata/hh5+gdata/p73+gdata/dk92
 #PBS -q normal
+#PBS -W block=true
 #PBS -l walltime=03:00:00
 #PBS -l mem=192gb
 #PBS -l ncpus=48
@@ -24,10 +25,11 @@ if [ ! $# -eq 0 ]; then
     version=$1
 fi
 
-conda activate access-nri-intake-test
+module use /g/data/xp65/public/modules
+module load conda/access-med-0.6
 
 OUTPUT_BASE_PATH=/g/data/xp65/public/apps/access-nri-intake-catalog
-CONFIG_DIR=/g/data/tm70/ds0092/projects/access-nri-intake-catalog/config
+CONFIG_DIR=/g/data/xp65/admin/access-nri-intake-catalog/config
 CONFIGS=( cmip5.yaml cmip6.yaml access-om2.yaml access-cm2.yaml access-esm1-5.yaml ) # erai.yaml
 
 config_paths=( "${CONFIGS[@]/#/${CONFIG_DIR}/}" )