Skip to content

Commit 0d36216

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev-v4' into releases/v4
2 parents ae11479 + e00d6bf commit 0d36216

14 files changed

+248
-422
lines changed

‎.github/workflows/build.yml

+28-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'releases/v*'
77
push:
88
branches:
9-
- dev
9+
- 'dev*'
1010
tags-ignore:
1111
- '*.*'
1212
jobs:
@@ -91,23 +91,42 @@ jobs:
9191
name: dist
9292

9393
- name: Deploy
94+
id: unmodified
9495
uses: ./
9596
with:
96-
FOLDER: integration
97-
BRANCH: ${{ matrix.branch }}
98-
SINGLE_COMMIT: ${{ matrix.commit == 'singleCommit' }}
99-
DRY_RUN: true
97+
folder: integration
98+
branch: ${{ matrix.branch }}
99+
single-commit: ${{ matrix.commit == 'singleCommit' }}
100+
dry-run: true
101+
102+
# Usually, this should be skipped, but if the upstream gh-pages
103+
# branch doesn't match ours, it should still be a success.
104+
- name: Check step output
105+
run: |
106+
[[ \
107+
${{steps.unmodified.outputs.deployment-status}} = skipped || \
108+
${{steps.unmodified.outputs.deployment-status}} = success \
109+
]]
100110
101111
- name: Tweak content to publish to existing branch
102112
if: ${{ matrix.branch == 'gh-pages' }}
103113
run: |
104114
echo "<!-- just sayin -->" >> integration/index.html
105115
106116
- name: Deploy with modifications to existing branch
117+
id: modified
107118
uses: ./
108119
if: ${{ matrix.branch == 'gh-pages' }}
109120
with:
110-
FOLDER: integration
111-
BRANCH: ${{ matrix.branch }}
112-
SINGLE_COMMIT: ${{ matrix.commit == 'singleCommit' }}
113-
DRY_RUN: true
121+
folder: integration
122+
branch: ${{ matrix.branch }}
123+
single-commit: ${{ matrix.commit == 'singleCommit' }}
124+
dry-run: true
125+
126+
# The modified deployment should be a success, and not skipped.
127+
- name: Check step output
128+
if: ${{ matrix.branch == 'gh-pages' }}
129+
run: |
130+
[[ \
131+
${{steps.modified.outputs.deployment-status}} = success \
132+
]]

‎.github/workflows/integration-beta.yml

-196
This file was deleted.

‎.github/workflows/integration.yml

+36-38
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- '*.*'
88
branches:
99
- dev
10-
- releases/v3
10+
- releases/v4
1111

1212
jobs:
1313
# Deploys using checkout@v1 with an ACCESS_TOKEN.
@@ -18,14 +18,14 @@ jobs:
1818
uses: actions/checkout@v1
1919

2020
- name: Build and Deploy
21-
uses: JamesIves/github-pages-deploy-action@releases/v3
21+
uses: JamesIves/github-pages-deploy-action@releases/v4
2222
with:
23-
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
24-
BRANCH: gh-pages
25-
FOLDER: integration
26-
TARGET_FOLDER: cat/montezuma
27-
GIT_CONFIG_NAME: Montezuma
28-
GIT_CONFIG_EMAIL: montezuma@jamesiv.es
23+
token: ${{ secrets.ACCESS_TOKEN }}
24+
branch: gh-pages
25+
folder: integration
26+
target-folder: cat/montezuma
27+
git-config-name: Montezuma
28+
git-config-email: montezuma@jamesiv.es
2929

3030
- name: Cleanup Generated Branch
3131
uses: dawidd6/action-delete-branch@v2.0.1
@@ -44,12 +44,11 @@ jobs:
4444
persist-credentials: false
4545

4646
- name: Build and Deploy
47-
uses: JamesIves/github-pages-deploy-action@releases/v3
47+
uses: JamesIves/github-pages-deploy-action@releases/v4
4848
with:
49-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50-
BRANCH: gh-pages
51-
FOLDER: integration
52-
TARGET_FOLDER: cat/montezuma2
49+
branch: gh-pages
50+
folder: integration
51+
target-folder: cat/montezuma2
5352

5453
- name: Cleanup Generated Branch
5554
uses: dawidd6/action-delete-branch@v2.0.1
@@ -77,12 +76,11 @@ jobs:
7776
apt-get update && apt-get install -y rsync
7877
7978
- name: Build and Deploy
80-
uses: JamesIves/github-pages-deploy-action@releases/v3
79+
uses: JamesIves/github-pages-deploy-action@releases/v4
8180
with:
82-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83-
BRANCH: gh-pages
84-
FOLDER: integration
85-
TARGET_FOLDER: cat/montezuma2
81+
branch: gh-pages
82+
folder: integration
83+
target-folder: cat/montezuma2
8684

8785
- name: Cleanup Generated Branch
8886
uses: dawidd6/action-delete-branch@v2.0.1
@@ -106,12 +104,12 @@ jobs:
106104
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
107105

108106
- name: Build and Deploy
109-
uses: JamesIves/github-pages-deploy-action@releases/v3
107+
uses: JamesIves/github-pages-deploy-action@releases/v4
110108
with:
111-
SSH: true
112-
BRANCH: gh-pages
113-
FOLDER: integration
114-
TARGET_FOLDER: cat/montezuma3
109+
ssh: true
110+
branch: gh-pages
111+
folder: integration
112+
target-folder: cat/montezuma3
115113

116114
- name: Cleanup Generated Branch
117115
uses: dawidd6/action-delete-branch@v2.0.1
@@ -139,12 +137,12 @@ jobs:
139137
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
140138

141139
- name: Build and Deploy
142-
uses: JamesIves/github-pages-deploy-action@releases/v3
140+
uses: JamesIves/github-pages-deploy-action@releases/v4
143141
with:
144-
SSH: true
145-
BRANCH: gh-pages
146-
FOLDER: integration
147-
TARGET_FOLDER: cat/montezuma4
142+
ssh: true
143+
branch: gh-pages
144+
folder: integration
145+
target-folder: cat/montezuma4
148146

149147
- name: Cleanup Generated Branch
150148
uses: dawidd6/action-delete-branch@v2.0.1
@@ -163,12 +161,12 @@ jobs:
163161
persist-credentials: false
164162

165163
- name: Build and Deploy
166-
uses: JamesIves/github-pages-deploy-action@releases/v3
164+
uses: JamesIves/github-pages-deploy-action@releases/v4
167165
with:
168-
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
169-
BRANCH: gh-pages
170-
FOLDER: integration
171-
CLEAN: true
166+
token: ${{ secrets.ACCESS_TOKEN }}
167+
branch: gh-pages
168+
folder: integration
169+
clean: true
172170

173171
# Deploys to a branch that doesn't exist with SINGLE_COMMIT.
174172
integration-branch-creation:
@@ -181,12 +179,12 @@ jobs:
181179
persist-credentials: false
182180

183181
- name: Build and Deploy
184-
uses: JamesIves/github-pages-deploy-action@releases/v3
182+
uses: JamesIves/github-pages-deploy-action@releases/v4
185183
with:
186-
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
187-
BRANCH: integration-test-delete-prod
188-
FOLDER: integration
189-
SINGLE_COMMIT: true
184+
token: ${{ secrets.ACCESS_TOKEN }}
185+
branch: integration-test-delete-prod
186+
folder: integration
187+
single-commit: true
190188

191189
- name: Cleanup Generated Branch
192190
uses: dawidd6/action-delete-branch@v2.0.1

0 commit comments

Comments
 (0)