Skip to content

Commit ae37c60

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into releases/v4
2 parents 55974d4 + 2a5af96 commit ae37c60

File tree

6 files changed

+35
-31
lines changed

6 files changed

+35
-31
lines changed

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Workflow dispatch event that pushes the current version to the release branch.
1414
# From here the secondary production deployment workflow will trigger to build the dependencies.
1515
- name: Deploy 🚀
16-
uses: JamesIves/[email protected].0
16+
uses: JamesIves/[email protected].2
1717
with:
1818
branch: releases/v4
1919
folder: .

‎.github/workflows/integration.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v3
2929

3030
- name: Build and Deploy
31-
uses: JamesIves/github-pages-deploy-action@releases/v4
31+
uses: JamesIves/github-pages-deploy-action@v4.3.2
3232
with:
3333
git-config-name: Montezuma
3434
git-config-email: [email protected]
@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/checkout@v3
5050

5151
- name: Build and Deploy
52-
uses: JamesIves/github-pages-deploy-action@releases/v4
52+
uses: JamesIves/github-pages-deploy-action@v4.3.2
5353
with:
5454
token: ${{ secrets.ACCESS_TOKEN }}
5555
branch: gh-pages
@@ -76,7 +76,7 @@ jobs:
7676
persist-credentials: false
7777

7878
- name: Build and Deploy
79-
uses: JamesIves/github-pages-deploy-action@releases/v4
79+
uses: JamesIves/github-pages-deploy-action@v4.3.2
8080
with:
8181
branch: gh-pages
8282
folder: integration
@@ -108,7 +108,7 @@ jobs:
108108
apt-get update && apt-get install -y rsync
109109
110110
- name: Build and Deploy
111-
uses: JamesIves/github-pages-deploy-action@releases/v4
111+
uses: JamesIves/github-pages-deploy-action@v4.3.2
112112
with:
113113
branch: gh-pages
114114
folder: integration
@@ -132,7 +132,7 @@ jobs:
132132
persist-credentials: false
133133

134134
- name: Build and Deploy
135-
uses: JamesIves/github-pages-deploy-action@releases/v4
135+
uses: JamesIves/github-pages-deploy-action@v4.3.2
136136
with:
137137
ssh-key: ${{ secrets.DEPLOY_KEY }}
138138
branch: gh-pages
@@ -162,7 +162,7 @@ jobs:
162162
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
163163

164164
- name: Build and Deploy
165-
uses: JamesIves/github-pages-deploy-action@releases/v4
165+
uses: JamesIves/github-pages-deploy-action@v4.3.2
166166
with:
167167
ssh-key: true
168168
branch: gh-pages
@@ -191,7 +191,7 @@ jobs:
191191
persist-credentials: false
192192

193193
- name: Build and Deploy
194-
uses: JamesIves/github-pages-deploy-action@releases/v4
194+
uses: JamesIves/github-pages-deploy-action@v4.3.2
195195
with:
196196
ssh-key: ${{ secrets.DEPLOY_KEY }}
197197
branch: gh-pages
@@ -200,7 +200,7 @@ jobs:
200200
silent: true
201201

202202
- name: Build and Deploy
203-
uses: JamesIves/github-pages-deploy-action@releases/v4
203+
uses: JamesIves/github-pages-deploy-action@v4.3.2
204204
with:
205205
ssh-key: ${{ secrets.DEPLOY_KEY }}
206206
branch: gh-pages
@@ -233,7 +233,7 @@ jobs:
233233
persist-credentials: false
234234

235235
- name: Build and Deploy
236-
uses: JamesIves/github-pages-deploy-action@releases/v4
236+
uses: JamesIves/github-pages-deploy-action@v4.3.2
237237
with:
238238
token: ${{ secrets.ACCESS_TOKEN }}
239239
branch: gh-pages
@@ -252,7 +252,7 @@ jobs:
252252
persist-credentials: false
253253

254254
- name: Build and Deploy
255-
uses: JamesIves/github-pages-deploy-action@releases/v4
255+
uses: JamesIves/github-pages-deploy-action@v4.3.2
256256
with:
257257
token: ${{ secrets.ACCESS_TOKEN }}
258258
branch: integration-test-delete-prod
@@ -261,7 +261,7 @@ jobs:
261261
silent: true
262262

263263
- name: Build and Deploy
264-
uses: JamesIves/github-pages-deploy-action@releases/v4
264+
uses: JamesIves/github-pages-deploy-action@v4.3.2
265265
with:
266266
token: ${{ secrets.ACCESS_TOKEN }}
267267
branch: integration-test-delete-prod
@@ -289,7 +289,7 @@ jobs:
289289
run: echo $RANDOM > integration/1
290290

291291
- name: Build and Deploy
292-
uses: JamesIves/github-pages-deploy-action@releases/v4
292+
uses: JamesIves/github-pages-deploy-action@v4.3.2
293293
with:
294294
git-config-name: Montezuma
295295
git-config-email: [email protected]
@@ -311,7 +311,7 @@ jobs:
311311
run: echo $RANDOM > integration/2
312312

313313
- name: Build and Deploy
314-
uses: JamesIves/github-pages-deploy-action@releases/v4
314+
uses: JamesIves/github-pages-deploy-action@v4.3.2
315315
with:
316316
git-config-name: Montezuma
317317
git-config-email: [email protected]

‎.github/workflows/sponsors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
marker: 'premium'
3030

3131
- name: Deploy to GitHub Pages
32-
uses: JamesIves/[email protected].0
32+
uses: JamesIves/[email protected].2
3333
with:
3434
branch: dev
3535
folder: '.'

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@jamesives/github-pages-deploy-action",
33
"description": "GitHub action for building a project and deploying it to GitHub pages.",
44
"author": "James Ives <[email protected]> (https://jamesiv.es)",
5-
"version": "4.3.1",
5+
"version": "4.3.2",
66
"license": "MIT",
77
"main": "lib/lib.js",
88
"types": "lib/lib.d.ts",
@@ -40,12 +40,12 @@
4040
},
4141
"devDependencies": {
4242
"@types/jest": "27.4.1",
43-
"@types/node": "17.0.25",
43+
"@types/node": "17.0.26",
4444
"@typescript-eslint/eslint-plugin": "4.33.0",
4545
"@typescript-eslint/parser": "4.33.0",
4646
"eslint": "7.32.0",
4747
"eslint-config-prettier": "8.5.0",
48-
"eslint-plugin-jest": "26.1.4",
48+
"eslint-plugin-jest": "26.1.5",
4949
"eslint-plugin-prettier": "4.0.0",
5050
"jest": "26.6.3",
5151
"jest-circus": "27.5.1",

‎src/git.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,15 @@ export async function deploy(action: ActionInterface): Promise<Status> {
131131
await generateWorktree(action, temporaryDeploymentDirectory, branchExists)
132132

133133
/* Relaxes permissions of folder due to be deployed so rsync can write to/from it. */
134-
await execute(
135-
`chmod -R +rw ${action.folderPath}`,
136-
action.workspace,
137-
action.silent
138-
)
134+
try {
135+
await execute(
136+
`chmod -R +rw ${action.folderPath}`,
137+
action.workspace,
138+
action.silent
139+
)
140+
} catch {
141+
info(`Unable to modify permissions…`)
142+
}
139143

140144
// Ensures that items that need to be excluded from the clean job get parsed.
141145
let excludes = ''

‎yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,10 +1271,10 @@
12711271
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
12721272
integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
12731273

1274-
"@types/node@*", "@types/[email protected].25", "@types/node@>= 8":
1275-
version "17.0.25"
1276-
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.25.tgz#527051f3c2f77aa52e5dc74e45a3da5fb2301448"
1277-
integrity sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==
1274+
"@types/node@*", "@types/[email protected].26", "@types/node@>= 8":
1275+
version "17.0.26"
1276+
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.26.tgz#1bbff9b23ee5a64f87b4f30c0c854b112ee2e635"
1277+
integrity sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==
12781278

12791279
"@types/normalize-package-data@^2.4.0":
12801280
version "2.4.0"
@@ -2150,10 +2150,10 @@ [email protected]:
21502150
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
21512151
integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
21522152

2153-
[email protected].4:
2154-
version "26.1.4"
2155-
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz#8e3410093ff4439d0c3a371add5bf9e05623a57a"
2156-
integrity sha512-wgqxujmqc2qpvZqMFWCh6Cniqc8lWpapvXt9j/19DmBDqeDaYhJrSRezYR1SKyemvjx+9e9kny/dgRahraHImA==
2153+
[email protected].5:
2154+
version "26.1.5"
2155+
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.5.tgz#6cfca264818d6d6aa120b019dab4d62b6aa8e775"
2156+
integrity sha512-su89aDuljL9bTjEufTXmKUMSFe2kZUL9bi7+woq+C2ukHZordhtfPm4Vg+tdioHBaKf8v3/FXW9uV0ksqhYGFw==
21572157
dependencies:
21582158
"@typescript-eslint/utils" "^5.10.0"
21592159

0 commit comments

Comments
 (0)