Merge branch 'dev' into releases/v4

JamesIves · Apr 26, 2022 · ae37c60 · ae37c60
2 parents 55974d4 + 2a5af96
commit ae37c60
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 31 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,7 +13,7 @@ jobs:
       # Workflow dispatch event that pushes the current version to the release branch.
       # From here the secondary production deployment workflow will trigger to build the dependencies.
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4.3.0
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           branch: releases/v4
           folder: .

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           git-config-name: Montezuma
           git-config-email: montezuma@jamesiv.es
@@ -49,7 +49,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
           branch: gh-pages
@@ -76,7 +76,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           branch: gh-pages
           folder: integration
@@ -108,7 +108,7 @@ jobs:
           apt-get update && apt-get install -y rsync
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           branch: gh-pages
           folder: integration
@@ -132,7 +132,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           ssh-key: ${{ secrets.DEPLOY_KEY }}
           branch: gh-pages
@@ -162,7 +162,7 @@ jobs:
           ssh-private-key: ${{ secrets.DEPLOY_KEY }}
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           ssh-key: true
           branch: gh-pages
@@ -191,7 +191,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           ssh-key: ${{ secrets.DEPLOY_KEY }}
           branch: gh-pages
@@ -200,7 +200,7 @@ jobs:
           silent: true
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           ssh-key: ${{ secrets.DEPLOY_KEY }}
           branch: gh-pages
@@ -233,7 +233,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
           branch: gh-pages
@@ -252,7 +252,7 @@ jobs:
           persist-credentials: false
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
           branch: integration-test-delete-prod
@@ -261,7 +261,7 @@ jobs:
           silent: true
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           token: ${{ secrets.ACCESS_TOKEN }}
           branch: integration-test-delete-prod
@@ -289,7 +289,7 @@ jobs:
         run: echo $RANDOM > integration/1
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           git-config-name: Montezuma
           git-config-email: montezuma@jamesiv.es
@@ -311,7 +311,7 @@ jobs:
         run: echo $RANDOM > integration/2
 
       - name: Build and Deploy
-        uses: JamesIves/github-pages-deploy-action@releases/v4
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           git-config-name: Montezuma
           git-config-email: montezuma@jamesiv.es

diff --git a/.github/workflows/sponsors.yml b/.github/workflows/sponsors.yml
@@ -29,7 +29,7 @@ jobs:
           marker: 'premium'
 
       - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.3.0
+        uses: JamesIves/github-pages-deploy-action@v4.3.2
         with:
           branch: dev
           folder: '.'
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@jamesives/github-pages-deploy-action",
   "description": "GitHub action for building a project and deploying it to GitHub pages.",
   "author": "James Ives <iam@jamesiv.es> (https://jamesiv.es)",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "license": "MIT",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",
@@ -40,12 +40,12 @@
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@types/node": "17.0.25",
+    "@types/node": "17.0.26",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "@typescript-eslint/parser": "4.33.0",
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-jest": "26.1.4",
+    "eslint-plugin-jest": "26.1.5",
     "eslint-plugin-prettier": "4.0.0",
     "jest": "26.6.3",
     "jest-circus": "27.5.1",

diff --git a/src/git.ts b/src/git.ts
@@ -131,11 +131,15 @@ export async function deploy(action: ActionInterface): Promise<Status> {
     await generateWorktree(action, temporaryDeploymentDirectory, branchExists)
 
     /* Relaxes permissions of folder due to be deployed so rsync can write to/from it. */
-    await execute(
-      `chmod -R +rw ${action.folderPath}`,
-      action.workspace,
-      action.silent
-    )
+    try {
+      await execute(
+        `chmod -R +rw ${action.folderPath}`,
+        action.workspace,
+        action.silent
+      )
+    } catch {
+      info(`Unable to modify permissions…`)
+    }
 
     // Ensures that items that need to be excluded from the clean job get parsed.
     let excludes = ''

diff --git a/yarn.lock b/yarn.lock
@@ -1271,10 +1271,10 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
-"@types/node@*", "@types/node@17.0.25", "@types/node@>= 8":
-  version "17.0.25"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.25.tgz#527051f3c2f77aa52e5dc74e45a3da5fb2301448"
-  integrity sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==
+"@types/node@*", "@types/node@17.0.26", "@types/node@>= 8":
+  version "17.0.26"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.26.tgz#1bbff9b23ee5a64f87b4f30c0c854b112ee2e635"
+  integrity sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -2150,10 +2150,10 @@ eslint-config-prettier@8.5.0:
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
   integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
 
-eslint-plugin-jest@26.1.4:
-  version "26.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.4.tgz#8e3410093ff4439d0c3a371add5bf9e05623a57a"
-  integrity sha512-wgqxujmqc2qpvZqMFWCh6Cniqc8lWpapvXt9j/19DmBDqeDaYhJrSRezYR1SKyemvjx+9e9kny/dgRahraHImA==
+eslint-plugin-jest@26.1.5:
+  version "26.1.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-26.1.5.tgz#6cfca264818d6d6aa120b019dab4d62b6aa8e775"
+  integrity sha512-su89aDuljL9bTjEufTXmKUMSFe2kZUL9bi7+woq+C2ukHZordhtfPm4Vg+tdioHBaKf8v3/FXW9uV0ksqhYGFw==
   dependencies:
     "@typescript-eslint/utils" "^5.10.0"