Move delete after history artifact capture

muselab-d2x · Oct 11, 2024 · 4a2a50e · 4a2a50e
1 parent 59021f3
commit 4a2a50e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/feature-test-snapshot.yml b/.github/workflows/feature-test-snapshot.yml
@@ -127,11 +127,6 @@ jobs:
                   fi
               shell: bash
 
-            - name: Delete Scratch Org
-              if: always()
-              run: cci org scratch_delete ${{ inputs.org_name }}
-              shell: bash
-
             - name: Capture CumulusCI Build History
               if: always()
               run: |
@@ -155,6 +150,11 @@ jobs:
                   name: cci-build-history
                   path: cci_build_history.json
 
+            - name: Delete Scratch Org
+              if: always()
+              run: cci org scratch_delete ${{ inputs.org_name }}
+              shell: bash
+
             - name: Check Job Status
               if: always()
               run: |

diff --git a/.github/workflows/feature-test.yml b/.github/workflows/feature-test.yml
@@ -54,11 +54,6 @@ jobs:
               run: cci history enable
             - name: Run Feature Test
               run: cci flow run ci_feature --use-snapshots
-            - name: Delete Scratch Org
-              if: always()
-              run: cci org scratch_delete ${{ inputs.org }}
-              shell: bash
-
             - name: Capture CumulusCI Build History
               if: always()
               run: |
@@ -75,6 +70,11 @@ jobs:
                   name: cci-dependencies-history
                   path: cci_dependencies_history.json
 
+            - name: Delete Scratch Org
+              if: always()
+              run: cci org scratch_delete ${{ inputs.org }}
+              shell: bash
+
             - name: Upload CumulusCI Build History
               if: always()
               uses: actions/upload-artifact@v4

diff --git a/.github/workflows/snapshot-flow.yml b/.github/workflows/snapshot-flow.yml
@@ -119,11 +119,6 @@ jobs:
                       exit 1
                   }
               shell: bash
-            - name: Delete Scratch Org
-              if: ${{ always() }}
-              run: |
-                  cci org scratch_delete ${{ inputs.org_name }}
-              shell: bash
             - name: Capture CumulusCI Build History
               if: always()
               run: |
@@ -140,6 +135,11 @@ jobs:
                   name: cci-dependencies-history
                   path: cci_dependencies_history.json
 
+            - name: Delete Scratch Org
+              if: ${{ always() }}
+              run: |
+                  cci org scratch_delete ${{ inputs.org_name }}
+              shell: bash
             - name: Upload CumulusCI Build History
               if: always()
               uses: actions/upload-artifact@v4