From 2f6c320effcc503c7cb773816c7e0159103da5ab Mon Sep 17 00:00:00 2001 From: JamesIves Date: Tue, 31 Mar 2020 12:26:01 -0400 Subject: [PATCH] More changes --- .github/workflows/integration-beta.yml | 9 +------- .github/workflows/integration.yml | 32 +++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration-beta.yml b/.github/workflows/integration-beta.yml index e89ba4f4..5ad0f00e 100644 --- a/.github/workflows/integration-beta.yml +++ b/.github/workflows/integration-beta.yml @@ -159,7 +159,7 @@ jobs: branches: gh-pages-test - # Deploys using the CLEAN option with SINGLE_COMMIT toggled. + # Deploys using the CLEAN option. integration-clean: needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env] runs-on: ubuntu-latest @@ -178,13 +178,6 @@ jobs: BASE_BRANCH: dev CLEAN: true - - name: Cleanup Generated Branch - uses: dawidd6/action-delete-branch@v2.0.1 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - branches: gh-pages-test - - # Deploys to a branch that doesn't exist with SINGLE_COMMIT. integration-branch-creation: runs-on: ubuntu-latest diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index d549f38a..dd37be90 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -28,6 +28,12 @@ jobs: GIT_CONFIG_NAME: Montezuma GIT_CONFIG_EMAIL: montezuma@jamesiv.es + - name: Cleanup Generated Branch + uses: dawidd6/action-delete-branch@v2.0.1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branches: gh-pages + # Deploys using checkout@v2 with a GITHUB_TOKEN. integration-checkout-v2: needs: integration-checkout-v1 @@ -47,6 +53,12 @@ jobs: BASE_BRANCH: dev TARGET_FOLDER: montezuma2 + - name: Cleanup Generated Branch + uses: dawidd6/action-delete-branch@v2.0.1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branches: gh-pages + # Deploys using a container that requires you to install rsync. integration-container: @@ -75,6 +87,12 @@ jobs: BASE_BRANCH: dev TARGET_FOLDER: montezuma2 + - name: Cleanup Generated Branch + uses: dawidd6/action-delete-branch@v2.0.1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branches: gh-pages + # Deploys using an SSH key. integration-ssh: needs: integration-container @@ -99,6 +117,12 @@ jobs: BASE_BRANCH: dev TARGET_FOLDER: montezuma3 + - name: Cleanup Generated Branch + uses: dawidd6/action-delete-branch@v2.0.1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branches: gh-pages + # Deploys using a custom env. integration-env: needs: integration-ssh @@ -127,7 +151,13 @@ jobs: BASE_BRANCH: dev TARGET_FOLDER: montezuma4 - # Deploys using the CLEAN option with SINGLE_COMMIT toggled. + - name: Cleanup Generated Branch + uses: dawidd6/action-delete-branch@v2.0.1 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + branches: gh-pages + + # Deploys using the CLEAN option. integration-clean: needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env] runs-on: ubuntu-latest