From c15d1ca1199e48241c5cc72d4934e7b93b9fc757 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2019 11:20:51 -0500 Subject: [PATCH 01/10] Bump @types/node from 12.12.21 to 13.1.0 (#95) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.12.21 to 13.1.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 36f05578..8256d316 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/jest": "^24.0.24", - "@types/node": "^12.12.21", + "@types/node": "^13.1.0", "jest": "^24.8.0", "jest-circus": "^24.7.1", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index 747c81c8..fe4db8fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -394,9 +394,9 @@ dependencies: jest-diff "^24.3.0" -"@types/node@>= 8", "@types/node@^12.12.21": - version "12.12.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.21.tgz#aa44a6363291c7037111c47e4661ad210aded23f" +"@types/node@>= 8", "@types/node@^13.1.0": + version "13.1.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.0.tgz#225cbaac5fdb2b9ac651b02c070d8aa3c37cc812" "@types/stack-utils@^1.0.1": version "1.0.1" From c09c91c45cad6a2ac262d96fd38ff6779fe3701a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2019 10:53:27 -0500 Subject: [PATCH 02/10] Bump @types/jest from 24.0.24 to 24.0.25 (#97) Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 24.0.24 to 24.0.25. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8256d316..3e0ec551 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@actions/github": "^2.0.0" }, "devDependencies": { - "@types/jest": "^24.0.24", + "@types/jest": "^24.0.25", "@types/node": "^13.1.0", "jest": "^24.8.0", "jest-circus": "^24.7.1", diff --git a/yarn.lock b/yarn.lock index fe4db8fd..f2af4988 100644 --- a/yarn.lock +++ b/yarn.lock @@ -388,9 +388,9 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" -"@types/jest@^24.0.24": - version "24.0.24" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.24.tgz#0f2f523dc77cc1bc6bef34eaf287ede887a73f05" +"@types/jest@^24.0.25": + version "24.0.25" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.25.tgz#2aba377824ce040114aa906ad2cac2c85351360f" dependencies: jest-diff "^24.3.0" From 17114f18d10fb9d27aa6d3b1d77a9741151e8018 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2019 14:55:05 -0500 Subject: [PATCH 03/10] Bump @types/node from 13.1.0 to 13.1.1 (#96) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 13.1.0 to 13.1.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3e0ec551..bb3a07d6 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/jest": "^24.0.25", - "@types/node": "^13.1.0", + "@types/node": "^13.1.1", "jest": "^24.8.0", "jest-circus": "^24.7.1", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index f2af4988..6424bf0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -394,9 +394,9 @@ dependencies: jest-diff "^24.3.0" -"@types/node@>= 8", "@types/node@^13.1.0": - version "13.1.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.0.tgz#225cbaac5fdb2b9ac651b02c070d8aa3c37cc812" +"@types/node@>= 8", "@types/node@^13.1.1": + version "13.1.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.1.tgz#6d11a8c2d58405b3db9388ab740106cbfa64c3c9" "@types/stack-utils@^1.0.1": version "1.0.1" From 149c6aa9968c9c19df84ca459cd3edff5d98101b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2019 12:37:25 -0500 Subject: [PATCH 04/10] Bump @types/node from 13.1.1 to 13.1.2 (#101) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 13.1.1 to 13.1.2. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index bb3a07d6..40d6c935 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/jest": "^24.0.25", - "@types/node": "^13.1.1", + "@types/node": "^13.1.2", "jest": "^24.8.0", "jest-circus": "^24.7.1", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index 6424bf0d..09a57a70 100644 --- a/yarn.lock +++ b/yarn.lock @@ -394,9 +394,9 @@ dependencies: jest-diff "^24.3.0" -"@types/node@>= 8", "@types/node@^13.1.1": - version "13.1.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.1.tgz#6d11a8c2d58405b3db9388ab740106cbfa64c3c9" +"@types/node@>= 8", "@types/node@^13.1.2": + version "13.1.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.2.tgz#fe94285bf5e0782e1a9e5a8c482b1c34465fa385" "@types/stack-utils@^1.0.1": version "1.0.1" From 53da38d519a0d6e26ffdc973227c0594bf17a11f Mon Sep 17 00:00:00 2001 From: James Ives Date: Fri, 3 Jan 2020 10:11:43 -0500 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14f643e9..54ebf137 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Below you'll find a description of what each option does. | `BRANCH` | This is the branch you wish to deploy to, for example `gh-pages` or `docs`. | `with` | **Yes** | | `FOLDER` | The folder in your repository that you want to deploy. If your build script compiles into a directory named `build` you'd put it here. **Folder paths cannot have a leading `/` or `./`**. If you wish to deploy the root directory you can place a `.` here. | `with` | **Yes** | | `TARGET_FOLDER` | If you'd like to push the contents of the deployment folder into a specific directory on the deployment branch you can specify it here. | `with` | **No** | -| `BASE_BRANCH` | The base branch of your repository which you'd like to checkout prior to deploying. This defaults to the current commit [SHA](http://en.wikipedia.org/wiki/SHA-1) that triggered the build followed by `master`. This is useful for making deployments from another branch, and also may be neccersary when using a scheduled job. | `with` | **No** | +| `BASE_BRANCH` | The base branch of your repository which you'd like to checkout prior to deploying. This defaults to the current commit [SHA](http://en.wikipedia.org/wiki/SHA-1) that triggered the build followed by `master` if it doesn't exist. This is useful for making deployments from another branch, and also may be neccersary when using a scheduled job. | `with` | **No** | | `CLEAN` | If your project generates hashed files on build you can use this option to automatically delete them from the deployment branch with each deploy. This option can be toggled on by setting it to `true`. | `with` | **No** | | `CLEAN_EXCLUDE` | If you need to use `CLEAN` but you'd like to preserve certain files or folders you can use this option. This should be formatted as an array but stored as a string. For example: `'["filename.js", "folder"]'` | `with` | **No** | From d82fb6ae59156af72fa4bb4a086d93f9bbfe5085 Mon Sep 17 00:00:00 2001 From: James Ives Date: Sun, 5 Jan 2020 10:50:14 -0500 Subject: [PATCH 06/10] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 40d6c935..61c61936 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "github-pages-deploy-action", "description": "GitHub action for building a project and deploying it to GitHub pages.", - "private": true, + "version": "3.1.1", "main": "lib/main.js", "scripts": { "build": "tsc", From 17848e9017054eda41a312c28f6a4c5df23a4a9c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2020 10:26:50 -0500 Subject: [PATCH 07/10] Bump @types/node from 13.1.2 to 13.1.4 (#103) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 13.1.2 to 13.1.4. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 09a57a70..d887e8d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -395,8 +395,8 @@ jest-diff "^24.3.0" "@types/node@>= 8", "@types/node@^13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.2.tgz#fe94285bf5e0782e1a9e5a8c482b1c34465fa385" + version "13.1.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.4.tgz#4cfd90175a200ee9b02bd6b1cd19bc349741607e" "@types/stack-utils@^1.0.1": version "1.0.1" From e23cb300bf1b4b930b1a59e55348030621165739 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2020 08:14:48 -0500 Subject: [PATCH 08/10] Bump ts-jest from 24.2.0 to 24.3.0 (#109) Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 24.2.0 to 24.3.0. - [Release notes](https://github.com/kulshekhar/ts-jest/releases) - [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/kulshekhar/ts-jest/compare/v24.2.0...v24.3.0) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index d887e8d0..079d0b2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3082,8 +3082,8 @@ tr46@^1.0.1: punycode "^2.1.0" ts-jest@^24.2.0: - version "24.2.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768" + version "24.3.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.3.0.tgz#b97814e3eab359ea840a1ac112deae68aa440869" dependencies: bs-logger "0.x" buffer-from "1.x" From a6723fe7857e421f9ac5164bbda0d67881c906c8 Mon Sep 17 00:00:00 2001 From: James Ives Date: Tue, 7 Jan 2020 10:59:50 -0500 Subject: [PATCH 09/10] [Issue-107] Fixes an issue that prevents new branches from being created (#108) * test * l * x * Tests --- __tests__/git.test.ts | 6 +++--- lib/git.js | 3 +-- src/git.ts | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/__tests__/git.test.ts b/__tests__/git.test.ts index 8590cae8..7e181aff 100644 --- a/__tests__/git.test.ts +++ b/__tests__/git.test.ts @@ -30,7 +30,7 @@ describe("git", () => { }); const call = await init(); - expect(execute).toBeCalledTimes(3); + expect(execute).toBeCalledTimes(4); expect(call).toBe("Initialization step complete..."); }); @@ -46,7 +46,7 @@ describe("git", () => { const call = await init(); - expect(execute).toBeCalledTimes(3); + expect(execute).toBeCalledTimes(4); expect(call).toBe("Initialization step complete..."); }); @@ -109,7 +109,7 @@ describe("git", () => { const call = await init(); - expect(execute).toBeCalledTimes(3); + expect(execute).toBeCalledTimes(4); expect(call).toBe("Initialization step complete..."); }); }); diff --git a/lib/git.js b/lib/git.js index a6599587..a060e751 100644 --- a/lib/git.js +++ b/lib/git.js @@ -68,7 +68,6 @@ function generateBranch() { yield util_1.execute(`git reset --hard`, constants_1.workspace); yield util_1.execute(`git commit --allow-empty -m "Initial ${constants_1.action.branch} commit."`, constants_1.workspace); yield util_1.execute(`git push ${constants_1.repositoryPath} ${constants_1.action.branch}`, constants_1.workspace); - // Switches back to the base branch. yield switchToBaseBranch(); } catch (error) { @@ -98,7 +97,7 @@ function deploy() { } // Checks out the base branch to begin the deployment process. yield switchToBaseBranch(); - yield util_1.execute(`git fetch ${constants_1.repositoryPath}`, constants_1.workspace); + yield util_1.execute(`git fetch origin`, constants_1.workspace); yield util_1.execute(`git worktree add --checkout ${temporaryDeploymentDirectory} origin/${constants_1.action.branch}`, constants_1.workspace); // Ensures that items that need to be excluded from the clean job get parsed. let excludes = ""; diff --git a/src/git.ts b/src/git.ts index 824eb1c1..7a2065fe 100644 --- a/src/git.ts +++ b/src/git.ts @@ -22,6 +22,7 @@ export async function init(): Promise { await execute(`git init`, workspace); await execute(`git config user.name ${action.name}`, workspace); await execute(`git config user.email ${action.email}`, workspace); + await execute(`git fetch origin`, workspace); } catch (error) { core.setFailed(`There was an error initializing the repository: ${error}`); } finally { @@ -88,7 +89,7 @@ export async function deploy(): Promise { // Checks out the base branch to begin the deployment process. await switchToBaseBranch(); - await execute(`git fetch ${repositoryPath}`, workspace); + await execute(`git fetch origin`, workspace); await execute( `git worktree add --checkout ${temporaryDeploymentDirectory} origin/${action.branch}`, workspace From a84ddb95d911df5f193247979412c721efd3ec08 Mon Sep 17 00:00:00 2001 From: James Ives Date: Tue, 7 Jan 2020 11:04:49 -0500 Subject: [PATCH 10/10] Improves templates (#110) --- .github/ISSUE_TEMPLATE/BUG_REPORT.md | 8 ++------ .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md | 4 ++-- .github/ISSUE_TEMPLATE/SUPPORT.md | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/SUPPORT.md diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md index 01b642d0..dae5265f 100644 --- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md @@ -13,13 +13,9 @@ about: Create a bug report to help us improve the action. > Steps to reproduce the behavior. -**Expected behavior** +**Logs** -> Please provide a clear and concise description of what you expected to happen. - -**Screenshots** - -> If applicable, add screenshots to help explain your problem. +> Please provide your deployment logs and a link to your workflow file. **Additional Comments** diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md index 52e7c09c..fcc99316 100644 --- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md @@ -6,7 +6,7 @@ about: If you'd like to make a suggestion please fill out the form below. **Is your feature request related to a problem? Please describe.** -> Please provide a clear and concise description of what the problem is. Ex. I'm always frustrated when [...] +> Please provide a clear and concise description of what the problem is. **Describe the solution you'd like** @@ -14,4 +14,4 @@ about: If you'd like to make a suggestion please fill out the form below. **Additional Comments** -> Add any other context or screenshots about the feature request here. +> Add any other context about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/SUPPORT.md b/.github/ISSUE_TEMPLATE/SUPPORT.md new file mode 100644 index 00000000..87fa91c6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/SUPPORT.md @@ -0,0 +1,18 @@ +--- +name: Support +about: If you're having problems setting up the action you can make a request for support here. + +--- + +**Describe the Issue** + +> Please provide a clear and concise description of what the problem is. + +**Logs** + +> Please provide your deployment logs and a link to your workflow file. + + +**Additional Comments** + +> Add any other context about the issue here.