Merge branch 'trs/pathogen-repo-ci/keep-going-2'

nextstrain · Jun 14, 2024 · 18e3f79 · 18e3f79
2 parents f2486c9 + 00085b8
commit 18e3f79
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/pathogen-repo-ci.yaml b/.github/workflows/pathogen-repo-ci.yaml
@@ -286,18 +286,16 @@ jobs:
         if: hashFiles('ingest/Snakefile') && hashFiles('ingest/build-configs/ci/config.yaml')
         id: ingest
         run: nextstrain build ingest --configfile build-configs/ci/config.yaml
-        continue-on-error: true
       - name: Run phylogenetic
-        if: hashFiles('phylogenetic/Snakefile') && hashFiles('phylogenetic/build-configs/ci/config.yaml')
+        if: hashFiles('phylogenetic/Snakefile') && hashFiles('phylogenetic/build-configs/ci/config.yaml') && !cancelled()
         id: phylogenetic
         run: nextstrain build phylogenetic --configfile build-configs/ci/config.yaml
-        continue-on-error: true
       - name: Run nextclade
-        if: hashFiles('nextclade/Snakefile') && hashFiles('nextclade/build-configs/ci/config.yaml')
+        if: hashFiles('nextclade/Snakefile') && hashFiles('nextclade/build-configs/ci/config.yaml') && !cancelled()
         id: nextclade
         run: nextstrain build nextclade --configfile build-configs/ci/config.yaml
-        continue-on-error: true
-      - uses: actions/upload-artifact@v4
+      - if: always()
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifact-name }}-${{ matrix.runtime }}
           if-no-files-found: ignore
@@ -320,10 +318,13 @@ jobs:
             nextclade/benchmarks/
             nextclade/logs/
             nextclade/results/
-      - name: Verify a workflow ran
+      - if: always()
+        name: Verify a workflow ran
         env:
           # "outcome" is success/failure/cancelled/skipped _before_
-          # "continue-on-error" is applied to calculate "conclusion"
+          # "continue-on-error" is applied to calculate "conclusion"; we no
+          # longer use continue-on-error for these steps, but even so,
+          # conceptually here what we want is outcome not conclusion.
           ingest: ${{ steps.ingest.outcome }}
           phylogenetic: ${{ steps.phylogenetic.outcome }}
           nextclade: ${{ steps.nextclade.outcome }}

diff --git a/.github/workflows/pathogen-repo-ci.yaml.in b/.github/workflows/pathogen-repo-ci.yaml.in
@@ -263,21 +263,19 @@ jobs:
         if: hashFiles('ingest/Snakefile') && hashFiles('ingest/build-configs/ci/config.yaml')
         id: ingest
         run: nextstrain build ingest --configfile build-configs/ci/config.yaml
-        continue-on-error: true
 
       - name: Run phylogenetic
-        if: hashFiles('phylogenetic/Snakefile') && hashFiles('phylogenetic/build-configs/ci/config.yaml')
+        if: hashFiles('phylogenetic/Snakefile') && hashFiles('phylogenetic/build-configs/ci/config.yaml') && !cancelled()
         id: phylogenetic
         run: nextstrain build phylogenetic --configfile build-configs/ci/config.yaml
-        continue-on-error: true
 
       - name: Run nextclade
-        if: hashFiles('nextclade/Snakefile') && hashFiles('nextclade/build-configs/ci/config.yaml')
+        if: hashFiles('nextclade/Snakefile') && hashFiles('nextclade/build-configs/ci/config.yaml') && !cancelled()
         id: nextclade
         run: nextstrain build nextclade --configfile build-configs/ci/config.yaml
-        continue-on-error: true
 
-      - uses: actions/upload-artifact@v4
+      - if: always()
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.artifact-name }}-${{ matrix.runtime }}
           if-no-files-found: ignore
@@ -301,10 +299,13 @@ jobs:
             nextclade/logs/
             nextclade/results/
 
-      - name: Verify a workflow ran
+      - if: always()
+        name: Verify a workflow ran
         env:
           # "outcome" is success/failure/cancelled/skipped _before_
-          # "continue-on-error" is applied to calculate "conclusion"
+          # "continue-on-error" is applied to calculate "conclusion"; we no
+          # longer use continue-on-error for these steps, but even so,
+          # conceptually here what we want is outcome not conclusion.
           ingest: ${{ steps.ingest.outcome }}
           phylogenetic: ${{ steps.phylogenetic.outcome }}
           nextclade: ${{ steps.nextclade.outcome }}