From a3b048231a949ac8e589817ca330e5acce983782 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 10:55:11 -0500 Subject: [PATCH 1/6] Bump ts-jest from 24.1.0 to 24.2.0 (#66) Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 24.1.0 to 24.2.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.1.0...v24.2.0) 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 b8c732d5..336d9e99 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "jest-circus": "^24.7.1", "lodash": "^4.17.15", "prettier": "^1.19.1", - "ts-jest": "^24.0.2", + "ts-jest": "^24.2.0", "tslint": "^5.20.0", "typescript": "^3.7.2" } diff --git a/yarn.lock b/yarn.lock index fcdca3a2..1e67f69b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3074,9 +3074,9 @@ tr46@^1.0.1: dependencies: punycode "^2.1.0" -ts-jest@^24.0.2: - version "24.1.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.1.0.tgz#2eaa813271a2987b7e6c3fefbda196301c131734" +ts-jest@^24.2.0: + version "24.2.0" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768" dependencies: bs-logger "0.x" buffer-from "1.x" From 602b8f615374e6a673d47df218bd4828842e0efb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2019 10:55:26 -0500 Subject: [PATCH 2/6] Bump @types/node from 12.12.11 to 12.12.12 (#67) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.12.11 to 12.12.12. - [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 336d9e99..738d874b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/jest": "^24.0.23", - "@types/node": "^12.12.11", + "@types/node": "^12.12.12", "jest": "^24.8.0", "jest-circus": "^24.7.1", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index 1e67f69b..70711a2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -387,9 +387,9 @@ dependencies: jest-diff "^24.3.0" -"@types/node@>= 8", "@types/node@^12.12.11": - version "12.12.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.11.tgz#bec2961975888d964196bf0016a2f984d793d3ce" +"@types/node@>= 8", "@types/node@^12.12.12": + version "12.12.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.12.tgz#529bc3e73dbb35dd9e90b0a1c83606a9d3264bdb" "@types/stack-utils@^1.0.1": version "1.0.1" From 98917ba5c6d4f9f28bb4904e1de92c15e626e012 Mon Sep 17 00:00:00 2001 From: James Ives Date: Mon, 25 Nov 2019 10:57:28 -0500 Subject: [PATCH 3/6] Operating System README Configuration (#68) * Operating system readme * Update README.md * Update README.md * Update README.md --- README.md | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e808b3e9..46e72891 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ on: #### Operating System Support 💿 -This action is primarily developed using [Ubuntu](https://ubuntu.com/). [In your workflow job configuration](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idruns-on) it's reccomended to set the `runs-on` property to `ubuntu-latest`. Operating systems such as [Windows](https://www.microsoft.com/en-us/windows/) are not currently supported. +This action is primarily developed using [Ubuntu](https://ubuntu.com/). [In your workflow job configuration](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idruns-on) it's reccomended to set the `runs-on` property to `ubuntu-latest`. ``` jobs: @@ -47,6 +47,53 @@ jobs: runs-on: ubuntu-latest ``` +Operating systems such as [Windows](https://www.microsoft.com/en-us/windows/) are not currently supported, however you can workaround this using [artifacts](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/persisting-workflow-data-using-artifacts). In your workflow configuration you can utilize the `actions/upload-artifact` and `actions/download-artifact` actions to move your project built on a Windows job to a secondary job that will handle the deployment. + +
You can view an example of this pattern here. +

+ +```yml +name: Build and Deploy +on: [push] +jobs: + build: + runs-on: windows-latest # The first job utilizes windows-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Install # The project is built using npm and placed in the 'build' folder. + run: | + npm install + npm run-script build + + - name: Upload Artifacts # The project is then uploaded as an artifact named 'site'. + uses: actions/upload-artifact@v1 + with: + name: site + path: build + + deploy: + needs: [build] # The second job must depend on the first one to complete before running, and uses ubuntu-latest instead of windows. + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Download Artifacts # The built project is downloaded into the 'site' folder. + uses: actions/download-artifact@v1 + with: + name: site + + - name: Build and Deploy + uses: JamesIves/github-pages-deploy-action@releases/v3 + with: + ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} + BRANCH: gh-pages + FOLDER: 'site' # The deployment folder should match the name of the artifact. Even though our project builds into the 'build' folder the artifact name of 'site' must be placed here. +``` +

+
## Configuration 📁 From cdaee34060ddb73cc8d2d3a94fecf66fec84eb3e Mon Sep 17 00:00:00 2001 From: James Ives Date: Mon, 25 Nov 2019 10:58:06 -0500 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46e72891..53d6abab 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ on: This action is primarily developed using [Ubuntu](https://ubuntu.com/). [In your workflow job configuration](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idruns-on) it's reccomended to set the `runs-on` property to `ubuntu-latest`. -``` +```yml jobs: build-and-deploy: runs-on: ubuntu-latest From 2b3be1b4951a23d4eb38c9861d443b012a613aaa Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2019 07:28:24 -0500 Subject: [PATCH 5/6] Bump @types/node from 12.12.12 to 12.12.14 (#69) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.12.12 to 12.12.14. - [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 738d874b..0b143380 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/jest": "^24.0.23", - "@types/node": "^12.12.12", + "@types/node": "^12.12.14", "jest": "^24.8.0", "jest-circus": "^24.7.1", "lodash": "^4.17.15", diff --git a/yarn.lock b/yarn.lock index 70711a2a..9dd4768f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -387,9 +387,9 @@ dependencies: jest-diff "^24.3.0" -"@types/node@>= 8", "@types/node@^12.12.12": - version "12.12.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.12.tgz#529bc3e73dbb35dd9e90b0a1c83606a9d3264bdb" +"@types/node@>= 8", "@types/node@^12.12.14": + version "12.12.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.14.tgz#1c1d6e3c75dba466e0326948d56e8bd72a1903d2" "@types/stack-utils@^1.0.1": version "1.0.1" From 9464f67397f1bf31a16b2be0baf51f8bfdef18c5 Mon Sep 17 00:00:00 2001 From: James Ives Date: Wed, 27 Nov 2019 08:36:19 -0500 Subject: [PATCH 6/6] Private Repository Issue (#71) * git fetch origin does not work in private repositories * Revert "git fetch origin does not work in private repositories" This reverts commit e115e86689d5b4a35d612b2753a97d1e8fe23a58. * Origin issues --- lib/git.js | 2 +- src/git.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git.js b/lib/git.js index 81fbe162..bdce914f 100644 --- a/lib/git.js +++ b/lib/git.js @@ -86,7 +86,7 @@ function deploy() { } // Checks out the base branch to begin the deployment process. yield util_1.execute(`git checkout ${constants_1.action.baseBranch || "master"}`, constants_1.workspace); - yield util_1.execute(`git fetch origin`, constants_1.workspace); + yield util_1.execute(`git fetch ${constants_1.repositoryPath}`, constants_1.workspace); yield util_1.execute(`git worktree add --checkout ${temporaryDeploymentDirectory} origin/${constants_1.action.branch}`, constants_1.workspace); /* Pushes all of the build files into the deployment directory. diff --git a/src/git.ts b/src/git.ts index 62aaa867..21a4f543 100644 --- a/src/git.ts +++ b/src/git.ts @@ -76,7 +76,7 @@ export async function deploy(): Promise { // Checks out the base branch to begin the deployment process. await execute(`git checkout ${action.baseBranch || "master"}`, workspace); - await execute(`git fetch origin`, workspace); + await execute(`git fetch ${repositoryPath}`, workspace); await execute( `git worktree add --checkout ${temporaryDeploymentDirectory} origin/${action.branch}`, workspace