rerun pipelines with new cache names

ktmeaton · Jul 24, 2020 · e6148f6 · e6148f6
1 parent 427d1ed
commit e6148f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/pipeline_assembly.yaml b/.github/workflows/pipeline_assembly.yaml
@@ -57,7 +57,7 @@ jobs:
         with:
           path: |
             /home/runner/miniconda/envs/plague-phylogeography-0.1.4dev
-          key: plague-phylogeography-env-cache-${{ runner.os }}-test2-${{ hashFiles('./plague-phylogeography.yaml') }}
+          key: plague-phylogeography-env-${{ runner.os }}-${{ hashFiles('./plague-phylogeography.yaml') }}
       #------------------------------------------------------------------------#
       # Check conda environments
       - name: check cache
@@ -67,6 +67,7 @@ jobs:
         if:  steps.plague-phylogeography-env-cache-restore.outputs.cache-hit != 'true'
         run: |
           echo "plague-phylogeography cache failed to load."
+          echo "Try rerunning workflow after install workflow finishes."
           exit 1
       #------------------------------------------------------------------------#
       #  Test Pipeline - Small
@@ -84,13 +85,13 @@ jobs:
             ${GH_RESOURCES}
           conda deactivate
       #  Test Pipeline - Long
-      - name: pipeline large
+      - name: pipeline long
         if:  steps.plague-phylogeography-env-cache-restore.outputs.cache-hit == 'true'
         shell: bash -l {0}
         run: |
           conda activate ${PHYLO_CONDA_ENV}
           nextflow run -r ${GITHUB_SHA} ${GITHUB_REPOSITORY} \
-            --max_datasets_assembly 2 \
+            --max_datasets_assembly 4 \
             --skip_sra_download \
             --skip_eager \
             --skip_outgroup_download \

diff --git a/.github/workflows/pipeline_sra.yaml b/.github/workflows/pipeline_sra.yaml
@@ -70,15 +70,15 @@ jobs:
         with:
           path: |
             /home/runner/miniconda/envs/nf-core-eager-2.2.0dev
-          key: eager-env-cache-${{ runner.os }}-test2-${{ hashFiles('./nf-core-eager.yaml') }}
+          key: eager-env-${{ runner.os }}-${{ hashFiles('./nf-core-eager.yaml') }}
 
       - name: restore plague-phylogeography cache
         uses: actions/cache@v2
         id: plague-phylogeography-env-cache-restore
         with:
           path: |
             /home/runner/miniconda/envs/plague-phylogeography-0.1.4dev
-          key: plague-phylogeography-env-cache-${{ runner.os }}-test2-${{ hashFiles('./plague-phylogeography.yaml') }}
+          key: plague-phylogeography-env-${{ runner.os }}-${{ hashFiles('./plague-phylogeography.yaml') }}
       #------------------------------------------------------------------------#
       # Check conda environments
       - name: check cache
@@ -88,11 +88,13 @@ jobs:
         if:  steps.eager-env-cache-restore.outputs.cache-hit != 'true'
         run: |
           echo "eager cache failed to load."
+          echo "Try rerunning workflow after install workflow finishes."
           exit 1
       - name: fail plague-phylogeography cache
         if:  steps.plague-phylogeography-env-cache-restore.outputs.cache-hit != 'true'
         run: |
           echo "plague-phylogeography cache failed to load."
+          echo "Try rerunning workflow after install workflow finishes."
           exit 1
       #------------------------------------------------------------------------#
       #  Download SRA Data