8000 More changes · FFY00/github-pages-deploy-action@2f6c320 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2f6c320

Browse files
JamesIvesJamesIves
committed
More changes
1 parent 34b5c4e commit 2f6c320

File tree

2 files changed

+32
-9
lines changed

2 files changed

+32
-9
lines changed

‎.github/workflows/integration-beta.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
branches: gh-pages-test
160160

161161

162-
# Deploys using the CLEAN option with SINGLE_COMMIT toggled.
162+
# Deploys using the CLEAN option.
163163
integration-clean:
164164
needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env]
165165
runs-on: ubuntu-latest
@@ -178,13 +178,6 @@ jobs:
178178
BASE_BRANCH: dev
179179
CLEAN: true
180180

181-
- name: Cleanup Generated Branch
182-
uses: dawidd6/action-delete-branch@v2.0.1
183-
with:
184-
github_token: ${{ secrets.GITHUB_TOKEN }}
185-
branches: gh-pages-test
186-
187-
188181
# Deploys to a branch that doesn't exist with SINGLE_COMMIT.
189182
integration-branch-creation:
190183
runs-on: ubuntu-latest

‎.github/workflows/integration.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ jobs:
2828
GIT_CONFIG_NAME: Montezuma
2929
GIT_CONFIG_EMAIL: montezuma@jamesiv.es
3030

31+
- name: Cleanup Generated Branch
32+
uses: dawidd6/action-delete-branch@v2.0.1
33+
with:
34+
github_token: ${{ secrets.GITHUB_TOKEN }}
35+
branches: gh-pages
36+
3137
# Deploys using checkout@v2 with a GITHUB_TOKEN.
3238
integration-checkout-v2:
3339
needs: integration-checkout-v1
@@ -47,6 +53,12 @@ jobs:
4753
BASE_BRANCH: dev
4854
TARGET_FOLDER: montezuma2
4955

56+
- name: Cleanup Generated Branch
57+
uses: dawidd6/action-delete-branch@v2.0.1
58+
with:
59+
github_token: ${{ secrets.GITHUB_TOKEN }}
60+
branches: gh-pages
61+
5062

5163
# Deploys using a container that requires you to install rsync.
5264
integration-container:
@@ -75,6 +87,12 @@ jobs:
7587
BASE_BRANCH: dev
7688
TARGET_FOLDER: montezuma2
7789

90+
- name: Cleanup Generated Branch
91+
uses: dawidd6/action-delete-branch@v2.0.1
92+
with:
93+
github_token: ${{ secrets.GITHUB_TOKEN }}
94+
branches: gh-pages
95+
7896
# Deploys using an SSH key.
7997
integration-ssh:
8098
needs: integration-container
@@ -99,6 +117,12 @@ jobs:
99117
BASE_BRANCH: dev
100118
TARGET_FOLDER: montezuma3
101119

120+
- name: Cleanup Generated Branch
121+
uses: dawidd6/action-delete-branch@v2.0.1
122+
with:
123+
github_token: ${{ secrets.GITHUB_TOKEN }}
124+
branches: gh-pages
125+
102126
# Deploys using a custom env.
103127
integration-env:
104128
needs: integration-ssh
@@ -127,7 +151,13 @@ jobs:
127151
BASE_BRANCH: dev
128152
TARGET_FOLDER: montezuma4
129153

130 733A -
# Deploys using the CLEAN option with SINGLE_COMMIT toggled.
154+
- name: Cleanup Generated Branch
155+
uses: dawidd6/action-delete-branch@v2.0.1
156+
with:
157+
github_token: ${{ secrets.GITHUB_TOKEN }}
158+
branches: gh-pages
159+
160+
# Deploys using the CLEAN option.
131161
integration-clean:
132162
needs: [integration-checkout-v1, integration-checkout-v2, integration-container, integration-ssh, integration-env]
133163
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)
0