Merge branch 'dev' into releases/v4

JamesIves · Jul 6, 2024 · 9e7ec1e · 9e7ec1e
2 parents 94f3c65 + 21b07c0
commit 9e7ec1e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 6 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -79,6 +79,8 @@ jobs:
           folder: integration
           target-folder: cat/montezuma2
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v3.1.0
@@ -109,6 +111,8 @@ jobs:
           folder: integration
           target-folder: cat/montezuma2
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v3.1.0
@@ -133,6 +137,8 @@ jobs:
           folder: integration
           target-folder: cat/montezuma3
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v3.1.0
@@ -162,6 +168,8 @@ jobs:
           folder: integration
           target-folder: cat/montezuma4
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v3.1.0
@@ -189,6 +197,8 @@ jobs:
           folder: integration
           target-folder: cat/montezuma4
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Build and Deploy
         uses: JamesIves/github-pages-deploy-action@v4
@@ -197,6 +207,8 @@ jobs:
           folder: integration
           target-folder: cat/subsequent
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v3.1.0
@@ -229,6 +241,8 @@ jobs:
           folder: integration
           clean: true
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
   # Deploys to a branch that doesn't exist with SINGLE_COMMIT. (Includes subsequent commit)
   integration-branch-creation:
@@ -248,6 +262,8 @@ jobs:
           folder: integration
           single-commit: true
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Build and Deploy
         uses: JamesIves/github-pages-deploy-action@v4
@@ -258,6 +274,8 @@ jobs:
           single-commit: true
           target-folder: jives
           silent: true
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
 
       - name: Cleanup Generated Branch
         uses: dawidd6/action-delete-branch@v3.1.0

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -2,7 +2,7 @@ name: Label Pull Requests 🏷️
 
 on:
   pull_request:
-    types: [opened, reopened, labeled, unlabeled]
+    types: [opened, reopened, labeled, unlabeled, synchronize]
 
 permissions:
   pull-requests: write

diff --git a/.github/workflows/sponsors.yml b/.github/workflows/sponsors.yml
@@ -35,3 +35,5 @@ jobs:
         with:
           branch: dev
           folder: '.'
+          git-config-name: Montezuma
+          git-config-email: montezuma@jamesiv.es
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -13,6 +13,7 @@ jobs:
       - uses: nowactions/update-majorver@v1.1.2
 
   update-registries:
+    name: Publish to Registries 📦
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -64,4 +65,4 @@ jobs:
       # Publish to GitHub Packages
       - run: npm publish
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts
@@ -41,7 +41,7 @@ describe('main', () => {
   it('should run through the commands', async () => {
     Object.assign(action, {
       repositoryPath: 'JamesIves/github-pages-deploy-action',
-      folder: '.github/assets',
+      folder: '.github/docs',
       branch: 'branch',
       token: '123',
       hostname: 'github.com',
@@ -62,7 +62,7 @@ describe('main', () => {
     Object.assign(action, {
       hostname: 'github.com',
       repositoryPath: 'JamesIves/github-pages-deploy-action',
-      folder: '.github/assets',
+      folder: '.github/docs',
       branch: 'branch',
       token: '123',
       sshKey: true,
@@ -81,7 +81,7 @@ describe('main', () => {
   it('should throw if an error is encountered', async () => {
     Object.assign(action, {
       hostname: 'github.com',
-      folder: '.github/assets',
+      folder: '.github/docs',
       branch: 'branch',
       token: null,
       sshKey: null,

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.6.1",
+  "version": "4.6.3",
   "license": "MIT",
   "main": "lib/lib.js",
   "types": "lib/lib.d.ts",