Skip to content

Commit 32bb2a8

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into releases/v4
2 parents a1ea191 + 7879c16 commit 32bb2a8

File tree

15 files changed

+79
-71
lines changed

15 files changed

+79
-71
lines changed

‎.devcontainer/Dockerfile

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

‎.devcontainer/base.Dockerfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.devcontainer/devcontainer.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
"VARIANT": "14"
7+
"VARIANT": "18"
88
}
99
},
10-
"settings": {
11-
"terminal.integrated.shell.linux": "/bin/bash"
10+
"customizations": {
11+
"env": {
12+
"PATH": "/usr/local/share/.config/yarn/global/node_modules/.bin:$PATH"
13+
},
14+
"vscode": {
15+
"settings": {
16+
"terminal.integrated.shell.linux": "/bin/bash"
17+
},
18+
"extensions": ["dbaeumer.vscode-eslint"]
19+
}
1220
},
13-
"extensions": ["dbaeumer.vscode-eslint"],
1421
"remoteUser": "node"
1522
}

‎.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

19-
- uses: actions/setup-node@v3
19+
- uses: actions/setup-node@v4
2020
with:
21-
node-version: 'v16.13.2'
21+
node-version: 'v20.10.0'
2222
registry-url: 'https://registry.npmjs.org'
2323

2424
- name: Install Yarn
@@ -40,11 +40,11 @@ jobs:
4040
runs-on: ubuntu-latest
4141
steps:
4242
- name: Checkout
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444

45-
- uses: actions/setup-node@v3
45+
- uses: actions/setup-node@v4
4646
with:
47-
node-version: 'v16.13.2'
47+
node-version: 'v20.10.0'
4848
registry-url: 'https://registry.npmjs.org'
4949

5050
- name: Install Yarn
@@ -78,13 +78,13 @@ jobs:
7878
max-parallel: 1
7979
steps:
8080
- name: Checkout
81-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8282
with:
8383
persist-credentials: false
8484

85-
- uses: actions/setup-node@v3
85+
- uses: actions/setup-node@v4
8686
with:
87-
node-version: 'v16.13.2'
87+
node-version: 'v20.10.0'
8888
registry-url: 'https://registry.npmjs.org'
8989

9090
- name: Download artifact

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

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

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
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.

‎.github/workflows/integration.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
apt-get update && apt-get install -y rsync
2626
2727
- name: Checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Build and Deploy
3131
uses: JamesIves/github-pages-deploy-action@v4
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
steps:
4848
- name: Checkout
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050

5151
- name: Build and Deploy
5252
uses: JamesIves/github-pages-deploy-action@v4
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
steps:
7171
- name: Checkout
72-
uses: actions/checkout@v3
72+
uses: actions/checkout@v4
7373
with:
7474
persist-credentials: false
7575

@@ -95,7 +95,7 @@ jobs:
9595
LANG: C.UTF-8
9696
steps:
9797
- name: Checkout
98-
uses: actions/checkout@v3
98+
uses: actions/checkout@v4
9999
with:
100100
persist-credentials: false
101101

@@ -122,7 +122,7 @@ jobs:
122122
runs-on: ubuntu-latest
123123
steps:
124124
- name: Checkout
125-
uses: actions/checkout@v3
125+
uses: actions/checkout@v4
126126
with:
127127
persist-credentials: false
128128

@@ -146,7 +146,7 @@ jobs:
146146
runs-on: ubuntu-latest
147147
steps:
148148
- name: Checkout
149-
uses: actions/checkout@v3
149+
uses: actions/checkout@v4
150150
with:
151151
persist-credentials: false
152152

@@ -173,12 +173,12 @@ jobs:
173173
needs: integration-ssh-third-party-client
174174
runs-on: ubuntu-latest
175175
steps:
176-
- uses: actions/setup-node@v3
176+
- uses: actions/setup-node@v4
177177
with:
178-
node-version: 'v16.13.2'
178+
node-version: 'v20.10.0'
179179

180180
- name: Checkout
181-
uses: actions/checkout@v3
181+
uses: actions/checkout@v4
182182
with:
183183
persist-credentials: false
184184

@@ -218,7 +218,7 @@ jobs:
218218
runs-on: ubuntu-latest
219219
steps:
220220
- name: Checkout
221-
uses: actions/checkout@v3
221+
uses: actions/checkout@v4
222222
with:
223223
persist-credentials: false
224224

@@ -236,7 +236,7 @@ jobs:
236236
runs-on: ubuntu-latest
237237
steps:
238238
- name: Checkout
239-
uses: actions/checkout@v3
239+
uses: actions/checkout@v4
240240
with:
241241
persist-credentials: false
242242

@@ -272,7 +272,7 @@ jobs:
272272
runs-on: ubuntu-latest
273273
steps:
274274
- name: Checkout
275-
uses: actions/checkout@v3
275+
uses: actions/checkout@v4
276276

277277
- name: Create random file
278278
run: echo $RANDOM > integration/1
@@ -294,7 +294,7 @@ jobs:
294294
runs-on: ubuntu-latest
295295
steps:
296296
- name: Checkout
297-
uses: actions/checkout@v3
297+
uses: actions/checkout@v4
298298

299299
- name: Create random file
300300
run: echo $RANDOM > integration/2

‎.github/workflows/production.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

18-
- uses: actions/setup-node@v3
18+
- uses: actions/setup-node@v4
1919
with:
20-
node-version: 'v16.13.2'
20+
node-version: 'v20.10.0'
2121
registry-url: 'https://registry.npmjs.org'
2222

2323
- name: Install Yarn

‎.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
ref: dev
1616

1717
# Setup .npmrc file to publish to npm
18-
- uses: actions/setup-node@v3
18+
- uses: actions/setup-node@v4
1919
with:
20-
node-version: 'v16.13.2'
20+
node-version: 'v20.10.0'
2121
registry-url: 'https://registry.npmjs.org'
2222
scope: '@jamesives'
2323

@@ -41,9 +41,9 @@ jobs:
4141
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4242

4343
# Setup .npmrc file to publish to GitHub Packages
44-
- uses: actions/setup-node@v3
44+
- uses: actions/setup-node@v4
4545
with:
46-
node-version: 'v16.13.2'
46+
node-version: 'v20.10.0'
4747
registry-url: 'https://npm.pkg.github.com'
4848
scope: '@jamesives'
4949

‎.github/workflows/sponsors.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout 🛎️
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: Generate Sponsors 💖
1515
uses: JamesIves/github-sponsors-readme-action@v1
1616
with:
1717
token: ${{ secrets.PAT }}
1818
file: 'README.md'
1919
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
20-
maximum: 9999
20+
maximum: 4999
2121

2222
- name: Generate Sponsors 💖
2323
uses: JamesIves/github-sponsors-readme-action@v1
2424
with:
2525
token: ${{ secrets.PAT }}
2626
file: 'README.md'
27-
minimum: 10000
27+
minimum: 5000
2828
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="80px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
2929
marker: 'premium'
3030

0 commit comments

Comments
 (0)