From d10388b10f2a1d63ab4859306b0bbe39021a9fd2 Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 5 Jul 2024 15:32:33 +0000 Subject: [PATCH 1/7] =?UTF-8?q?Release=204.6.3=20=F0=9F=93=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index add72a6bc..a756857c9 100644 --- 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 (https://jamesiv.es)", - "version": "4.6.1", + "version": "4.6.3", "license": "MIT", "main": "lib/lib.js", "types": "lib/lib.d.ts", From 92e273ed7f72548318acafee6afe40a06fe86876 Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 5 Jul 2024 11:32:59 -0400 Subject: [PATCH 2/7] Update version.yml --- .github/workflows/version.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index dca5b3855..2a386711e 100644 --- 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 From 38ab268ec6dc08aecb3f39ed3f4c9a2b1184058c Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 5 Jul 2024 11:37:09 -0400 Subject: [PATCH 3/7] Update version.yml --- .github/workflows/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 2a386711e..3586e735e 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -65,4 +65,4 @@ jobs: # Publish to GitHub Packages - run: npm publish env: - NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f37de74caecc8f5ed8d23c274b28d17644640645 Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 5 Jul 2024 12:29:51 -0400 Subject: [PATCH 4/7] test: fix unit test issue --- __tests__/main.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/__tests__/main.test.ts b/__tests__/main.test.ts index 19a2a83d3..f0ec58053 100644 --- 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, From efad91cbd622cb689590917e338e1310103c9cd4 Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 5 Jul 2024 12:59:18 -0400 Subject: [PATCH 5/7] chore: add sync to labeller --- .github/workflows/label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index e6cde3ee3..fb8177709 100644 --- 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 From 681026f0afd0a6d5bed19a45a9b2cd15706a8850 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 6 Jul 2024 17:47:37 -0400 Subject: [PATCH 6/7] chore: add git config to integration test --- .github/workflows/integration.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a0e8ad601..07b5bcfc3 100644 --- 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 From 21b07c072d061ebbf0d2229be9fe980d6b7bcfdd Mon Sep 17 00:00:00 2001 From: James Ives Date: Sat, 6 Jul 2024 17:47:52 -0400 Subject: [PATCH 7/7] Update sponsors.yml --- .github/workflows/sponsors.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sponsors.yml b/.github/workflows/sponsors.yml index 80d00922e..ed3c6451e 100644 --- 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