Skip to content

Commit 0752a8c

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into releases/v4
2 parents 2731bec + 91d4e8f commit 0752a8c

File tree

15 files changed

+182
-123
lines changed

15 files changed

+182
-123
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
22
{
3-
"name": "Node.js & TypeScript",
4-
"build": {
5-
"dockerfile": "Dockerfile",
6-
"args": {
7-
"VARIANT": "14"
8-
}
9-
},
10-
"settings": {
11-
"terminal.integrated.shell.linux": "/bin/bash"
12-
},
13-
"extensions": [
14-
"dbaeumer.vscode-eslint"
15-
],
16-
"remoteUser": "node"
3+
"name": "Node.js & TypeScript",
4+
"build": {
5+
"dockerfile": "Dockerfile",
6+
"args": {
7+
"VARIANT": "14"
8+
}
9+
},
10+
"settings": {
11+
"terminal.integrated.shell.linux": "/bin/bash"
12+
},
13+
"extensions": ["dbaeumer.vscode-eslint"],
14+
"remoteUser": "node"
1715
}

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Install and Test
2828
run: |
29-
yarn install
29+
yarn install --frozen-lockfile
3030
yarn lint
3131
yarn test
3232
@@ -51,12 +51,12 @@ jobs:
5151

5252
- name: Build lib
5353
run: |
54-
yarn install
54+
yarn install --frozen-lockfile
5555
yarn build
5656
5757
- name: Rebuild production node_modules
5858
run: |
59-
yarn install --production
59+
yarn install --production --frozen-lockfile
6060
ls node_modules
6161
6262
- name: artifact

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Workflow dispatch event that pushes the current version to the release branch.
1414
# From here the secondary production deployment workflow will trigger to build the dependencies.
1515
- name: Deploy 🚀
16-
uses: JamesIves/github-pages-deploy-action@4.2.1
16+
uses: JamesIves/github-pages-deploy-action@v4.2.2
1717
with:
1818
branch: releases/v4
1919
folder: .

‎.github/workflows/integration.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/[email protected]
2424

2525
- name: Build and Deploy
26-
uses: JamesIves/github-pages-deploy-action@4.2.1
26+
uses: JamesIves/github-pages-deploy-action@v4
2727
with:
2828
git-config-name: Montezuma
2929
git-config-email: [email protected]
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v1
4545

4646
- name: Build and Deploy
47-
uses: JamesIves/github-pages-deploy-action@4.2.1
47+
uses: JamesIves/github-pages-deploy-action@v4
4848
with:
4949
token: ${{ secrets.ACCESS_TOKEN }}
5050
branch: gh-pages
@@ -71,7 +71,7 @@ jobs:
7171
persist-credentials: false
7272

7373
- name: Build and Deploy
74-
uses: JamesIves/github-pages-deploy-action@4.2.1
74+
uses: JamesIves/github-pages-deploy-action@v4
7575
with:
7676
branch: gh-pages
7777
folder: integration
@@ -103,7 +103,7 @@ jobs:
103103
apt-get update && apt-get install -y rsync
104104
105105
- name: Build and Deploy
106-
uses: JamesIves/github-pages-deploy-action@4.2.1
106+
uses: JamesIves/github-pages-deploy-action@v4
107107
with:
108108
branch: gh-pages
109109
folder: integration
@@ -127,7 +127,7 @@ jobs:
127127
persist-credentials: false
128128

129129
- name: Build and Deploy
130-
uses: JamesIves/github-pages-deploy-action@4.2.1
130+
uses: JamesIves/github-pages-deploy-action@v4
131131
with:
132132
ssh-key: ${{ secrets.DEPLOY_KEY }}
133133
branch: gh-pages
@@ -157,7 +157,7 @@ jobs:
157157
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
158158

159159
- name: Build and Deploy
160-
uses: JamesIves/github-pages-deploy-action@4.2.1
160+
uses: JamesIves/github-pages-deploy-action@v4
161161
with:
162162
ssh-key: true
163163
branch: gh-pages
@@ -186,7 +186,7 @@ jobs:
186186
persist-credentials: false
187187

188188
- name: Build and Deploy
189-
uses: JamesIves/github-pages-deploy-action@4.2.1
189+
uses: JamesIves/github-pages-deploy-action@v4
190190
with:
191191
ssh-key: ${{ secrets.DEPLOY_KEY }}
192192
branch: gh-pages
@@ -195,7 +195,7 @@ jobs:
195195
silent: true
196196

197197
- name: Build and Deploy
198-
uses: JamesIves/github-pages-deploy-action@4.2.1
198+
uses: JamesIves/github-pages-deploy-action@v4
199199
with:
200200
ssh-key: ${{ secrets.DEPLOY_KEY }}
201201
branch: gh-pages
@@ -218,7 +218,7 @@ jobs:
218218
integration-container,
219219
integration-ssh,
220220
integration-ssh-third-party-client,
221-
integration-env,
221+
integration-env
222222
]
223223
runs-on: ubuntu-latest
224224
steps:
@@ -228,7 +228,7 @@ jobs:
228228
persist-credentials: false
229229

230230
- name: Build and Deploy
231-
uses: JamesIves/github-pages-deploy-action@4.2.1
231+
uses: JamesIves/github-pages-deploy-action@v4
232232
with:
233233
token: ${{ secrets.ACCESS_TOKEN }}
234234
branch: gh-pages
@@ -247,7 +247,7 @@ jobs:
247247
persist-credentials: false
248248

249249
- name: Build and Deploy
250-
uses: JamesIves/github-pages-deploy-action@4.2.1
250+
uses: JamesIves/github-pages-deploy-action@v4
251251
with:
252252
token: ${{ secrets.ACCESS_TOKEN }}
253253
branch: integration-test-delete-prod
@@ -256,7 +256,7 @@ jobs:
256256
silent: true
257257

258258
- name: Build and Deploy
259-
uses: JamesIves/github-pages-deploy-action@4.2.1
259+
uses: JamesIves/github-pages-deploy-action@v4
260260
with:
261261
token: ${{ secrets.ACCESS_TOKEN }}
262262
branch: integration-test-delete-prod

‎.github/workflows/production.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
3333
- name: Build
3434
run: |
35-
yarn install
35+
yarn install --frozen-lockfile
3636
yarn build
3737
3838
- name: Install Production node_modules
3939
run: |
40-
yarn install --production
40+
yarn install --production --frozen-lockfile
4141
4242
- name: Commit and Push
4343
# Keep the run green if the commit fails for the lack of changes

‎.github/workflows/sponsors.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,24 @@ jobs:
1212
uses: actions/[email protected]
1313

1414
- name: Generate Sponsors 💖
15-
uses: JamesIves/github-sponsors-readme-action@1.0.7
15+
uses: JamesIves/github-sponsors-readme-action@v1.0.8
1616
with:
1717
token: ${{ secrets.PAT }}
1818
file: 'README.md'
19-
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="" /></a>'
20-
minimum: 500
19+
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
20+
maximum: 9999
21+
22+
- name: Generate Sponsors 💖
23+
uses: JamesIves/[email protected]
24+
with:
25+
token: ${{ secrets.PAT }}
26+
file: 'README.md'
27+
minimum: 10000
28+
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="80px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
29+
marker: 'premium'
2130

2231
- name: Deploy to GitHub Pages
23-
uses: JamesIves/github-pages-deploy-action@4.2.1
32+
uses: JamesIves/github-pages-deploy-action@v4.2.2
2433
with:
2534
branch: dev
2635
folder: '.'

‎.github/workflows/version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Update Major Version Tag
33
on:
44
push:
55
tags:
6-
- "v*"
6+
- 'v*'
77

88
jobs:
99
update-majorver:
1010
name: Update Major Version Tag
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: nowactions/update-majorver@v1
13+
- uses: nowactions/update-majorver@v1.1.2

‎README.md‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a href="https://github.com/marketplace/actions/deploy-to-github-pages">
3-
<img alt="" width="200px" src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/assets/icon.png">
3+
<img alt="GitHub Pages Deploy Action Logo" width="200px" src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/assets/icon.png">
44
</a>
55
</p>
66

@@ -35,12 +35,24 @@
3535
</p>
3636

3737
<p align="center">
38-
<img src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/assets/screenshot.png">
38+
<img src="https://github.com/JamesIves/github-pages-deploy-action/raw/dev/.github/assets/screenshot.png" alt="">
39+
</p>
40+
41+
<p align="center">
42+
Maintainence of this project is made possible by all the <a href="https://github.com/JamesIves/github-pages-deploy-action/graphs/contributors">contributors</a> and <a href="https://github.com/sponsors/JamesIves">sponsors</a>. If you'd like to sponsor this project and have your avatar or company logo appear below <a href="https://github.com/sponsors/JamesIves">click here</a>. 💖
43+
</p>
44+
45+
<p align="center">
46+
<!-- premium --><!-- premium -->
47+
</p>
48+
49+
<p align="center">
50+
<!-- sponsors --><a href="https://github.com/Chooksta69"><img src="https://github.com/Chooksta69.png" width="50px" alt="Chooksta69" /></a>&nbsp;&nbsp;<a href="https://github.com/milanpollock"><img src="https://github.com/milanpollock.png" width="50px" alt="milanpollock" /></a>&nbsp;&nbsp;<a href="https://github.com/robjtede"><img src="https://github.com/robjtede.png" width="50px" alt="robjtede" /></a>&nbsp;&nbsp;<!-- sponsors -->
3951
</p>
4052

4153
## Getting Started :airplane:
4254

43-
You can include the action in your workflow to trigger on any event that [GitHub actions supports](https://help.github.com/en/articles/events-that-trigger-workflows). If the remote branch that you wish to deploy to doesn't already exist the action will create it for you. Your workflow will also need to include the `actions/checkout` step before this workflow runs in order for the deployment to work.
55+
You can include the action in your workflow to trigger on any event that [GitHub actions supports](https://help.github.com/en/articles/events-that-trigger-workflows). If the remote branch that you wish to deploy to doesn't already exist the action will create it for you. Your workflow will also need to include the `actions/checkout` step before this workflow runs in order for the deployment to work. If you intend to make multiple deployments in quick succession [you may need to levereage the concurrency parameter in your workflow](https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions#concurrency) to prevent overlaps.
4456

4557
You can view an example of this below.
4658

@@ -49,10 +61,11 @@ name: Build and Deploy
4961
on: [push]
5062
jobs:
5163
build-and-deploy:
64+
concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
5265
runs-on: ubuntu-latest
5366
steps:
5467
- name: Checkout 🛎️
55-
uses: actions/checkout@v2.5.1
68+
uses: actions/checkout@v2
5669

5770
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
5871
run: |
@@ -196,10 +209,11 @@ on:
196209
- main
197210
jobs:
198211
deploy:
212+
concurrency: ci-${{ github.ref }}
199213
runs-on: ubuntu-latest
200214
steps:
201215
- name: Checkout 🛎️
202-
uses: actions/checkout@v2.5.1
216+
uses: actions/checkout@v2
203217

204218
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
205219
run: |
@@ -248,7 +262,7 @@ jobs:
248262
runs-on: windows-latest # The first job utilizes windows-latest
249263
steps:
250264
- name: Checkout 🛎️
251-
uses: actions/checkout@v2.5.1
265+
uses: actions/checkout@v2
252266
253267
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
254268
run: |
@@ -262,11 +276,12 @@ jobs:
262276
path: build
263277
264278
deploy:
279+
concurrency: ci-${{ github.ref }}
265280
needs: [build] # The second job must depend on the first one to complete before running, and uses ubuntu-latest instead of windows.
266281
runs-on: ubuntu-latest
267282
steps:
268283
- name: Checkout 🛎️
269-
uses: actions/checkout@v2.5.1
284+
uses: actions/checkout@v2
270285
271286
- name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
272287
uses: actions/download-artifact@v1
@@ -315,10 +330,11 @@ on:
315330
- main
316331
jobs:
317332
deploy:
333+
concurrency: ci-${{ github.ref }}
318334
runs-on: ubuntu-latest
319335
steps:
320336
- name: Checkout 🛎️
321-
uses: actions/checkout@v2.5.1
337+
uses: actions/checkout@v2
322338
323339
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
324340
run: |
@@ -340,11 +356,3 @@ jobs:
340356
</details>
341357

342358
If you wish to remove these files you must go into the deployment branch directly to remove them. This is to prevent accidental changes in your deployment script from creating breaking changes.
343-
344-
---
345-
346-
## Support 💖
347-
348-
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).
349-
350-
<!-- 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 -->

‎__tests__/env.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
process.env.ACTIONS_STEP_DEBUG = 'false'
2+
process.env.RUNNER_OS = 'Windows'

‎__tests__/main.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ process.env['INPUT_FOLDER'] = 'build'
33
process.env['GITHUB_SHA'] = '123'
44
process.env['INPUT_DEBUG'] = 'debug'
55
process.env['GITHUB_REF_NAME'] = 'test'
6+
process.env['RUNNER_OS'] = 'Linux'
67

78
import '../src/main'
89
import {action, TestFlag} from '../src/constants'
@@ -27,7 +28,8 @@ jest.mock('@actions/core', () => ({
2728
setOutput: jest.fn(),
2829
exportVariable: jest.fn(),
2930
isDebug: jest.fn(),
30-
info: jest.fn()
31+
info: jest.fn(),
32+
notice: jest.fn()
3133
}))
3234

3335
describe('main', () => {

0 commit comments

Comments
 (0)