Skip to content

Commit 9e7ec1e

Browse files
committed
Merge branch 'dev' into releases/v4
2 parents 94f3c65 + 21b07c0 commit 9e7ec1e

File tree

6 files changed

+27
-6
lines changed

6 files changed

+27
-6
lines changed

.github/workflows/integration.yml

+18
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ jobs:
7979
folder: integration
8080
target-folder: cat/montezuma2
8181
silent: true
82+
git-config-name: Montezuma
83+
git-config-email: montezuma@jamesiv.es
8284

8385
- name: Cleanup Generated Branch
8486
uses: dawidd6/action-delete-branch@v3.1.0
@@ -109,6 +111,8 @@ jobs:
109111
folder: integration
110112
target-folder: cat/montezuma2
111113
silent: true
114+
git-config-name: Montezuma
115+
git-config-email: montezuma@jamesiv.es
112116

113117
- name: Cleanup Generated Branch
114118
uses: dawidd6/action-delete-branch@v3.1.0
@@ -133,6 +137,8 @@ jobs:
133137
folder: integration
134138
target-folder: cat/montezuma3
135139
silent: true
140+
git-config-name: Montezuma
141+
git-config-email: montezuma@jamesiv.es
136142

137143
- name: Cleanup Generated Branch
138144
uses: dawidd6/action-delete-branch@v3.1.0
@@ -162,6 +168,8 @@ jobs:
162168
folder: integration
163169
target-folder: cat/montezuma4
164170
silent: true
171+
git-config-name: Montezuma
172+
git-config-email: montezuma@jamesiv.es
165173

166174
- name: Cleanup Generated Branch
167175
uses: dawidd6/action-delete-branch@v3.1.0
@@ -189,6 +197,8 @@ jobs:
189197
folder: integration
190198
target-folder: cat/montezuma4
191199
silent: true
200+
git-config-name: Montezuma
201+
git-config-email: montezuma@jamesiv.es
192202

193203
- name: Build and Deploy
194204
uses: JamesIves/github-pages-deploy-action@v4
@@ -197,6 +207,8 @@ jobs:
197207
folder: integration
198208
target-folder: cat/subsequent
199209
silent: true
210+
git-config-name: Montezuma
211+
git-config-email: montezuma@jamesiv.es
200212

201213
- name: Cleanup Generated Branch
202214
uses: dawidd6/action-delete-branch@v3.1.0
@@ -229,6 +241,8 @@ jobs:
229241
folder: integration
230242
clean: true
231243
silent: true
244+
git-config-name: Montezuma
245+
git-config-email: montezuma@jamesiv.es
232246

233247
# Deploys to a branch that doesn't exist with SINGLE_COMMIT. (Includes subsequent commit)
234248
integration-branch-creation:
@@ -248,6 +262,8 @@ jobs:
248262
folder: integration
249263
single-commit: true
250264
silent: true
265+
git-config-name: Montezuma
266+
git-config-email: montezuma@jamesiv.es
251267

252268
- name: Build and Deploy
253269
uses: JamesIves/github-pages-deploy-action@v4
@@ -258,6 +274,8 @@ jobs:
258274
single-commit: true
259275
target-folder: jives
260276
silent: true
277+
git-config-name: Montezuma
278+
git-config-email: montezuma@jamesiv.es
261279

262280
- name: Cleanup Generated Branch
263281
uses: dawidd6/action-delete-branch@v3.1.0

.github/workflows/label.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Label Pull Requests 🏷️
22

33
on:
44
pull_request:
5-
types: [opened, reopened, labeled, unlabeled]
5+
types: [opened, reopened, labeled, unlabeled, synchronize]
66

77
permissions:
88
pull-requests: write

.github/workflows/sponsors.yml

+2
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ jobs:
3535
with:
3636
branch: dev
3737
folder: '.'
38+
git-config-name: Montezuma
39+
git-config-email: montezuma@jamesiv.es

.github/workflows/version.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
- uses: nowactions/update-majorver@v1.1.2
1414

1515
update-registries:
16+
name: Publish to Registries 📦
1617
runs-on: ubuntu-latest
1718
steps:
1819
- uses: actions/checkout@v4
@@ -64,4 +65,4 @@ jobs:
6465
# Publish to GitHub Packages
6566
- run: npm publish
6667
env:
67-
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

__tests__/main.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('main', () => {
4141
it('should run through the commands', async () => {
4242
Object.assign(action, {
4343
repositoryPath: 'JamesIves/github-pages-deploy-action',
44-
folder: '.github/assets',
44+
folder: '.github/docs',
4545
branch: 'branch',
4646
token: '123',
4747
hostname: 'github.com',
@@ -62,7 +62,7 @@ describe('main', () => {
6262
Object.assign(action, {
6363
hostname: 'github.com',
6464
repositoryPath: 'JamesIves/github-pages-deploy-action',
65-
folder: '.github/assets',
65+
folder: '.github/docs',
6666
branch: 'branch',
6767
token: '123',
6868
sshKey: true,
@@ -81,7 +81,7 @@ describe('main', () => {
8181
it('should throw if an error is encountered', async () => {
8282
Object.assign(action, {
8383
hostname: 'github.com',
84-
folder: '.github/assets',
84+
folder: '.github/docs',
8585
branch: 'branch',
8686
token: null,
8787
sshKey: null,

package.json

+1-1
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 <iam@jamesiv.es> (https://jamesiv.es)",
5-
"version": "4.6.1",
5+
"version": "4.6.3",
66
"license": "MIT",
77
"main": "lib/lib.js",
88
"types": "lib/lib.d.ts",

0 commit comments

Comments
 (0)