Skip to content

Commit 266436c

Browse files
committed
Merge branch 'dev' into releases/v4
2 parents 5dc1d5a + b4b3776 commit 266436c

File tree

6 files changed

+343
-321
lines changed

6 files changed

+343
-321
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,4 +347,4 @@ If you wish to remove these files you must go into the deployment branch directl
347347

348348
This project would not be possible without all of our fantastic [contributors](https://github.com/JamesIves/github-pages-deploy-action/graphs/contributors) and [sponsors](https://github.com/sponsors/JamesIves). If you'd like to support the maintenance and upkeep of this project you can [donate via GitHub Sponsors](https://github.com/sponsors/JamesIves).
349349

350-
<!-- sponsors --><a href="https://github.com/MattWillFlood"><img src="https://github.com/MattWillFlood.png" width="50px" alt="" /></a><!-- sponsors -->
350+
<!-- sponsors --><a href="https://github.com/milanpollock"><img src="https://github.com/milanpollock.png" width="50px" alt="" /></a><!-- sponsors -->

__tests__/git.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ describe('git', () => {
216216
await deploy(action)
217217

218218
// Includes the call to generateWorktree
219-
expect(execute).toBeCalledTimes(11)
219+
expect(execute).toBeCalledTimes(12)
220220
expect(rmRF).toBeCalledTimes(1)
221221
})
222222

@@ -240,7 +240,7 @@ describe('git', () => {
240240
await deploy(action)
241241

242242
// Includes the call to generateWorktree
243-
expect(execute).toBeCalledTimes(10)
243+
expect(execute).toBeCalledTimes(11)
244244
expect(rmRF).toBeCalledTimes(1)
245245
})
246246

@@ -265,7 +265,7 @@ describe('git', () => {
265265
await deploy(action)
266266

267267
// Includes the call to generateWorktree
268-
expect(execute).toBeCalledTimes(10)
268+
expect(execute).toBeCalledTimes(11)
269269
expect(rmRF).toBeCalledTimes(1)
270270
})
271271

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ inputs:
6969
required: false
7070

7171
repository-name:
72-
description: 'Allows you to speicfy a different repository path so long as you have permissions to push to it. This should be formatted like so: JamesIves/github-pages-deploy-action'
72+
description: 'Allows you to specify a different repository path so long as you have permissions to push to it. This should be formatted like so: JamesIves/github-pages-deploy-action'
7373
required: false
7474

7575
workspace:

package.json

Lines changed: 14 additions & 14 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.1.3",
5+
"version": "4.1.4",
66
"license": "MIT",
77
"main": "lib/lib.js",
88
"types": "lib/lib.d.ts",
@@ -33,25 +33,25 @@
3333
"deployment"
3434
],
3535
"dependencies": {
36-
"@actions/core": "1.3.0",
37-
"@actions/exec": "1.0.4",
36+
"@actions/core": "1.5.0",
37+
"@actions/exec": "1.1.0",
3838
"@actions/github": "5.0.0",
39-
"@actions/io": "1.1.0"
39+
"@actions/io": "1.1.1"
4040
},
4141
"devDependencies": {
42-
"@types/jest": "26.0.23",
43-
"@types/node": "15.12.0",
44-
"@typescript-eslint/eslint-plugin": "4.26.0",
45-
"@typescript-eslint/parser": "4.26.0",
46-
"eslint": "7.27.0",
42+
"@types/jest": "27.0.1",
43+
"@types/node": "16.7.2",
44+
"@typescript-eslint/eslint-plugin": "4.29.3",
45+
"@typescript-eslint/parser": "4.29.3",
46+
"eslint": "7.32.0",
4747
"eslint-config-prettier": "8.3.0",
48-
"eslint-plugin-jest": "24.3.6",
49-
"eslint-plugin-prettier": "3.4.0",
48+
"eslint-plugin-jest": "24.4.0",
49+
"eslint-plugin-prettier": "3.4.1",
5050
"jest": "26.6.3",
51-
"jest-circus": "27.0.4",
52-
"prettier": "2.3.0",
51+
"jest-circus": "27.0.6",
52+
"prettier": "2.3.2",
5353
"rimraf": "3.0.2",
5454
"ts-jest": "26.5.6",
55-
"typescript": "4.3.2"
55+
"typescript": "4.3.5"
5656
}
5757
}

src/git.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ export async function deploy(action: ActionInterface): Promise<Status> {
143143
action.silent
144144
)
145145

146+
if (action.singleCommit) {
147+
await execute(
148+
`git add --all .`,
149+
`${action.workspace}/${temporaryDeploymentDirectory}`,
150+
action.silent
151+
)
152+
}
153+
146154
// Use git status to check if we have something to commit.
147155
// Special case is singleCommit with existing history, when
148156
// we're really interested if the diff against the upstream branch

0 commit comments

Comments
 (0)