From 1b2cfa174acb2ec98a5ee01a5cdba5dc9d215d86 Mon Sep 17 00:00:00 2001 From: Jason Lantz Date: Fri, 11 Oct 2024 09:46:06 -0500 Subject: [PATCH] Move scratch deletion to the end --- .github/workflows/feature-test.yml | 10 +++++----- .github/workflows/snapshot-flow.yml | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/feature-test.yml b/.github/workflows/feature-test.yml index 46db0d8..e4ae18d 100644 --- 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 index 38c2b0f..d966be5 100644 --- 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