Skip to content

Commit

Permalink
Merge branch 'dev' into releases/v4
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Dec 18, 2021
2 parents 6ce741f + 7a71951 commit 9749ca0
Show file tree
Hide file tree
Showing 5 changed files with 223 additions and 202 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -347,4 +347,4 @@ If you wish to remove these files you must go into the deployment branch directl

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).

<!-- sponsors --><a href="https://github.com/milanpollock"><img src="https://github.com/milanpollock.png" width="50px" alt="" /></a><!-- sponsors -->
<!-- sponsors --><a href="https://github.com/milanpollock"><img src="https://github.com/milanpollock.png" width="50px" alt="" /></a><a href="https://github.com/raoulvdberge"><img src="https://github.com/raoulvdberge.png" width="50px" alt="" /></a><!-- sponsors -->
2 changes: 1 addition & 1 deletion SECURITY.md
Expand Up @@ -7,7 +7,7 @@ The current version is actively maintained and will receive frequent updates and
| Version | Supported |
| ------- | ------------------ |
| 4.0.x | :white_check_mark: |
| < 3.0 | :x: |
| < 4.0.0 | :x: |

## Reporting a Vulnerability

Expand Down
1 change: 1 addition & 0 deletions integration/.nojekyll
@@ -0,0 +1 @@

10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -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.1.6",
"version": "4.1.7",
"license": "MIT",
"main": "lib/lib.js",
"types": "lib/lib.d.ts",
Expand Down Expand Up @@ -40,18 +40,18 @@
},
"devDependencies": {
"@types/jest": "27.0.3",
"@types/node": "16.11.10",
"@types/node": "17.0.0",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-plugin-jest": "25.3.0",
"eslint-plugin-prettier": "4.0.0",
"jest": "26.6.3",
"jest-circus": "27.3.1",
"prettier": "2.5.0",
"jest-circus": "27.4.5",
"prettier": "2.5.1",
"rimraf": "3.0.2",
"ts-jest": "26.5.6",
"typescript": "4.5.2"
"typescript": "4.5.4"
}
}

0 comments on commit 9749ca0

Please sign in to comment.