Move scratch deletion to the end

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

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/feature-test.yml b/.github/workflows/feature-test.yml
@@ -70,14 +70,14 @@ 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
               with:
                   name: cci-build-history
                   path: cci_build_history.json
+
+            - name: Delete Scratch Org
+              if: always()
+              run: cci org scratch_delete ${{ inputs.org }}
+              shell: bash
diff --git a/.github/workflows/snapshot-flow.yml b/.github/workflows/snapshot-flow.yml
@@ -135,14 +135,15 @@ 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
               with:
                   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