Skip to content

Commit fd3cf89

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into releases/v4
2 parents 0c59194 + 7f5f01a commit fd3cf89

22 files changed

+174
-98
lines changed

‎.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ARG VARIANT=12
1+
ARG VARIANT=14
22
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}

‎.devcontainer/base.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=12-buster
1+
ARG VARIANT=14-buster
22
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
33

44
# Install tslint, typescript. eslint is installed by javascript image

‎.devcontainer/devcontainer.json

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
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": "12"
8-
}
9-
},
10-
"settings": {
11-
"terminal.integrated.shell.linux": "/bin/bash"
12-
},
13-
"extensions": ["dbaeumer.vscode-eslint"],
14-
"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": [
14+
"dbaeumer.vscode-eslint"
15+
],
16+
"remoteUser": "node"
1517
}

‎.github/ISSUE_TEMPLATE/BUG_REPORT.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ labels:
1717

1818
## Logs
1919

20-
<!-- Please provide your deployment logs and a link or sample to/of your workflow. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
20+
<!-- Please provide your deployment logs. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
21+
22+
## Workflow
23+
24+
<!-- Please provide a link or snippet of your workflow yml file. -->
2125

2226
## Additional Comments
2327

‎.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ updates:
66
interval: daily
77
time: '10:00'
88
open-pull-requests-limit: 10
9+
10+
- package-ecosystem: github-actions
11+
directory: '/'
12+
schedule:
13+
interval: daily
14+
time: '10:00'
15+
open-pull-requests-limit: 10

‎.github/workflows/build.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v2.4.0
1818

19-
- uses: actions/setup-node@v1.4.4
19+
- uses: actions/setup-node@v2.5.1
2020
with:
2121
node-version: 'v14.18.1'
2222
registry-url: 'https://registry.npmjs.org'
@@ -31,17 +31,17 @@ jobs:
3131
yarn test
3232
3333
- name: Uploade CodeCov Report
34-
uses: codecov/codecov-action@v1
34+
uses: codecov/codecov-action@v2.1.0
3535
with:
3636
token: ${{ secrets.CODECOV_TOKEN }}
3737

3838
build:
3939
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v2.4.0
4343

44-
- uses: actions/setup-node@v1.4.4
44+
- uses: actions/setup-node@v2.5.1
4545
with:
4646
node-version: 'v14.18.1'
4747
registry-url: 'https://registry.npmjs.org'
@@ -77,11 +77,11 @@ jobs:
7777
max-parallel: 1
7878
steps:
7979
- name: Checkout
80-
uses: actions/checkout@v2
80+
uses: actions/checkout@v2.4.0
8181
with:
8282
persist-credentials: false
8383

84-
- uses: actions/setup-node@v1.4.4
84+
- uses: actions/setup-node@v2.5.1
8585
with:
8686
node-version: 'v14.18.1'
8787
registry-url: 'https://registry.npmjs.org'

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v2.4.0
2323

2424
- name: Initialize CodeQL
2525
uses: github/codeql-action/init@v1

‎.github/workflows/deploy.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v2.4.0
1212

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.0.0
16+
uses: JamesIves/github-pages-deploy-action@4.1.9
1717
with:
1818
branch: releases/v4
1919
folder: .

‎.github/workflows/integration.yml

+29-29
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v2.4.0
2424

2525
- name: Build and Deploy
26-
uses: JamesIves/github-pages-deploy-action@releases/v4
26+
uses: JamesIves/github-pages-deploy-action@4.1.9
2727
with:
2828
git-config-name: Montezuma
2929
git-config-email: montezuma@jamesiv.es
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v1
4545

4646
- name: Build and Deploy
47-
uses: JamesIves/github-pages-deploy-action@releases/v4
47+
uses: JamesIves/github-pages-deploy-action@4.1.9
4848
with:
4949
token: ${{ secrets.ACCESS_TOKEN }}
5050
branch: gh-pages
@@ -55,7 +55,7 @@ jobs:
5555
silent: true
5656

5757
- name: Cleanup Generated Branch
58-
uses: dawidd6/action-delete-branch@v2.0.1
58+
uses: dawidd6/action-delete-branch@v3.1.0
5959
with:
6060
github_token: ${{ secrets.GITHUB_TOKEN }}
6161
branches: gh-pages
@@ -66,20 +66,20 @@ jobs:
6666
runs-on: ubuntu-latest
6767
steps:
6868
- name: Checkout
69-
uses: actions/checkout@v2
69+
uses: actions/checkout@v2.4.0
7070
with:
7171
persist-credentials: false
7272

7373
- name: Build and Deploy
74-
uses: JamesIves/github-pages-deploy-action@releases/v4
74+
uses: JamesIves/github-pages-deploy-action@4.1.9
7575
with:
7676
branch: gh-pages
7777
folder: integration
7878
target-folder: cat/montezuma2
7979
silent: true
8080

8181
- name: Cleanup Generated Branch
82-
uses: dawidd6/action-delete-branch@v2.0.1
82+
uses: dawidd6/action-delete-branch@v3.1.0
8383
with:
8484
github_token: ${{ secrets.GITHUB_TOKEN }}
8585
branches: gh-pages
@@ -94,7 +94,7 @@ jobs:
9494
LANG: C.UTF-8
9595
steps:
9696
- name: Checkout
97-
uses: actions/checkout@v2
97+
uses: actions/checkout@v2.4.0
9898
with:
9999
persist-credentials: false
100100

@@ -103,15 +103,15 @@ jobs:
103103
apt-get update && apt-get install -y rsync
104104
105105
- name: Build and Deploy
106-
uses: JamesIves/github-pages-deploy-action@releases/v4
106+
uses: JamesIves/github-pages-deploy-action@4.1.9
107107
with:
108108
branch: gh-pages
109109
folder: integration
110110
target-folder: cat/montezuma2
111111
silent: true
112112

113113
- name: Cleanup Generated Branch
114-
uses: dawidd6/action-delete-branch@v2.0.1
114+
uses: dawidd6/action-delete-branch@v3.1.0
115115
with:
116116
github_token: ${{ secrets.GITHUB_TOKEN }}
117117
branches: gh-pages
@@ -122,12 +122,12 @@ jobs:
122122
runs-on: ubuntu-latest
123123
steps:
124124
- name: Checkout
125-
uses: actions/checkout@v2
125+
uses: actions/checkout@v2.4.0
126126
with:
127127
persist-credentials: false
128128

129129
- name: Build and Deploy
130-
uses: JamesIves/github-pages-deploy-action@releases/v4
130+
uses: JamesIves/github-pages-deploy-action@4.1.9
131131
with:
132132
ssh-key: ${{ secrets.DEPLOY_KEY }}
133133
branch: gh-pages
@@ -136,7 +136,7 @@ jobs:
136136
silent: true
137137

138138
- name: Cleanup Generated Branch
139-
uses: dawidd6/action-delete-branch@v2.0.1
139+
uses: dawidd6/action-delete-branch@v3.1.0
140140
with:
141141
github_token: ${{ secrets.GITHUB_TOKEN }}
142142
branches: gh-pages
@@ -147,17 +147,17 @@ jobs:
147147
runs-on: ubuntu-latest
148148
steps:
149149
- name: Checkout
150-
uses: actions/checkout@v2
150+
uses: actions/checkout@v2.4.0
151151
with:
152152
persist-credentials: false
153153

154154
- name: Install SSH Client
155-
uses: webfactory/ssh-agent@v0.4.1
155+
uses: webfactory/ssh-agent@v0.5.4
156156
with:
157157
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
158158

159159
- name: Build and Deploy
160-
uses: JamesIves/github-pages-deploy-action@releases/v4
160+
uses: JamesIves/github-pages-deploy-action@4.1.9
161161
with:
162162
ssh-key: true
163163
branch: gh-pages
@@ -166,7 +166,7 @@ jobs:
166166
silent: true
167167

168168
- name: Cleanup Generated Branch
169-
uses: dawidd6/action-delete-branch@v2.0.1
169+
uses: dawidd6/action-delete-branch@v3.1.0
170170
with:
171171
github_token: ${{ secrets.GITHUB_TOKEN }}
172172
branches: gh-pages
@@ -176,17 +176,17 @@ jobs:
176176
needs: integration-ssh-third-party-client
177177
runs-on: ubuntu-latest
178178
steps:
179-
- uses: actions/setup-node@v1.4.4
179+
- uses: actions/setup-node@v2.5.1
180180
with:
181181
node-version: 'v14.18.1'
182182

183183
- name: Checkout
184-
uses: actions/checkout@v2
184+
uses: actions/checkout@v2.4.0
185185
with:
186186
persist-credentials: false
187187

188188
- name: Build and Deploy
189-
uses: JamesIves/github-pages-deploy-action@releases/v4
189+
uses: JamesIves/github-pages-deploy-action@4.1.9
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@releases/v4
198+
uses: JamesIves/github-pages-deploy-action@4.1.9
199199
with:
200200
ssh-key: ${{ secrets.DEPLOY_KEY }}
201201
branch: gh-pages
@@ -204,7 +204,7 @@ jobs:
204204
silent: true
205205

206206
- name: Cleanup Generated Branch
207-
uses: dawidd6/action-delete-branch@v2.0.1
207+
uses: dawidd6/action-delete-branch@v3.1.0
208208
with:
209209
github_token: ${{ secrets.GITHUB_TOKEN }}
210210
branches: gh-pages
@@ -218,17 +218,17 @@ 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:
225225
- name: Checkout
226-
uses: actions/checkout@v2
226+
uses: actions/checkout@v2.4.0
227227
with:
228228
persist-credentials: false
229229

230230
- name: Build and Deploy
231-
uses: JamesIves/github-pages-deploy-action@releases/v4
231+
uses: JamesIves/github-pages-deploy-action@4.1.9
232232
with:
233233
token: ${{ secrets.ACCESS_TOKEN }}
234234
branch: gh-pages
@@ -242,12 +242,12 @@ jobs:
242242
runs-on: ubuntu-latest
243243
steps:
244244
- name: Checkout
245-
uses: actions/checkout@v2
245+
uses: actions/checkout@v2.4.0
246246
with:
247247
persist-credentials: false
248248

249249
- name: Build and Deploy
250-
uses: JamesIves/github-pages-deploy-action@releases/v4
250+
uses: JamesIves/github-pages-deploy-action@4.1.9
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@releases/v4
259+
uses: JamesIves/github-pages-deploy-action@4.1.9
260260
with:
261261
token: ${{ secrets.ACCESS_TOKEN }}
262262
branch: integration-test-delete-prod
@@ -266,7 +266,7 @@ jobs:
266266
silent: true
267267

268268
- name: Cleanup Generated Branch
269-
uses: dawidd6/action-delete-branch@v2.0.1
269+
uses: dawidd6/action-delete-branch@v3.1.0
270270
with:
271271
github_token: ${{ secrets.GITHUB_TOKEN }}
272272
branches: integration-test-delete-prod

‎.github/workflows/production.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v2.4.0
1717

18-
- uses: actions/setup-node@v1.4.4
18+
- uses: actions/setup-node@v2.5.1
1919
with:
2020
node-version: 'v14.18.1'
2121
registry-url: 'https://registry.npmjs.org'

0 commit comments

Comments
 (0)