More changes

This commit is contained in:
JamesIves 2020-03-31 12:26:01 -04:00
parent 34b5c4eeb9
commit 2f6c320eff
2 changed files with 32 additions and 9 deletions

View File

@ -159,7 +159,7 @@ jobs:
branches: gh-pages-test branches: gh-pages-test
# Deploys using the CLEAN option with SINGLE_COMMIT toggled. # Deploys using the CLEAN option.
integration-clean: integration-clean:
needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env] needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env]
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -178,13 +178,6 @@ jobs:
BASE_BRANCH: dev BASE_BRANCH: dev
CLEAN: true 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. # Deploys to a branch that doesn't exist with SINGLE_COMMIT.
integration-branch-creation: integration-branch-creation:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@ -28,6 +28,12 @@ jobs:
GIT_CONFIG_NAME: Montezuma GIT_CONFIG_NAME: Montezuma
GIT_CONFIG_EMAIL: montezuma@jamesiv.es 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. # Deploys using checkout@v2 with a GITHUB_TOKEN.
integration-checkout-v2: integration-checkout-v2:
needs: integration-checkout-v1 needs: integration-checkout-v1
@ -47,6 +53,12 @@ jobs:
BASE_BRANCH: dev BASE_BRANCH: dev
TARGET_FOLDER: montezuma2 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. # Deploys using a container that requires you to install rsync.
integration-container: integration-container:
@ -75,6 +87,12 @@ jobs:
BASE_BRANCH: dev BASE_BRANCH: dev
TARGET_FOLDER: montezuma2 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. # Deploys using an SSH key.
integration-ssh: integration-ssh:
needs: integration-container needs: integration-container
@ -99,6 +117,12 @@ jobs:
BASE_BRANCH: dev BASE_BRANCH: dev
TARGET_FOLDER: montezuma3 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. # Deploys using a custom env.
integration-env: integration-env:
needs: integration-ssh needs: integration-ssh
@ -127,7 +151,13 @@ jobs:
BASE_BRANCH: dev BASE_BRANCH: dev
TARGET_FOLDER: montezuma4 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: integration-clean:
needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env] needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env]
runs-on: ubuntu-latest runs-on: ubuntu-latest