Skip to content

Commit 01af764

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/parser-8.28.0
2 parents e8443d3 + 062bc21 commit 01af764

File tree

5 files changed

+37
-32
lines changed

5 files changed

+37
-32
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99

1010
jobs:
1111
quality_checks:
12-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@4.0.5
12+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5
1313
secrets:
1414
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
1515

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
nodejs 20.18.0
1+
nodejs 20.19.1
22
python 3.12.7
33
poetry 1.8.3
44
shellcheck 0.10.0
5-
actionlint 1.7.3
5+
actionlint 1.7.3

docker/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ ENV PATH="$PATH:/home/cdkuser/.asdf/bin/:/home/cdkuser/node_modules/.bin"
3131

3232
# Install ASDF plugins
3333
RUN asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git
34-
RUN asdf install nodejs 20.18.0
35-
34+
# install some common node versions that are used in builds to speed things up
35+
RUN asdf install nodejs 20.19.1
36+
RUN asdf install nodejs 23.9.0
37+
RUN asdf install nodejs 20.17.0
38+
RUN asdf install nodejs 20.19.0
39+
RUN asdf install nodejs 22.12.0
3640

3741
# copy files needed for deployment
3842
COPY --chown=cdkuser docker/entrypoint.sh /home/cdkuser/

package-lock.json

Lines changed: 26 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"devDependencies": {
1818
"@semantic-release/changelog": "^6.0.3",
1919
"@semantic-release/release-notes-generator": "^14.0.3",
20-
"@types/node": "^22.13.14",
20+
"@types/node": "^22.15.2",
2121
"@typescript-eslint/eslint-plugin": "^8.26.1",
2222
"@typescript-eslint/parser": "^8.28.0",
2323
"conventional-changelog-eslint": "^6.0.0",
24-
"eslint": "^9.22.0",
24+
"eslint": "^9.23.0",
2525
"eslint-plugin-import-newlines": "^1.4.0",
2626
"jest": "^29.7.0",
2727
"jest-junit": "^16.0.0",

0 commit comments

Comments
 (0)