Skip to content

Commit 4feb592

Browse files
anthony-nhsanthony-nhs
committed
fix
1 parent f9598f3 commit 4feb592

6 files changed

Lines changed: 40 additions & 37 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"args": {
77
"DOCKER_GID": "${env:DOCKER_GID:}",
88
"IMAGE_NAME": "node_24_python_3_14",
9-
"IMAGE_VERSION": "v1.4.2",
9+
"IMAGE_VERSION": "v1.4.8",
1010
"USER_UID": "${localEnv:USER_ID:}",
1111
"USER_GID": "${localEnv:GROUP_ID:}"
1212
},

‎.gitallowed‎

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

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: ci
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [ main ]
66
permissions: {}
77
jobs:
88
get_config_values:
9-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@e798d5aee897de6f7dc387dd5623fcd9ba4c8929
9+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
1010
permissions:
1111
attestations: "read"
1212
contents: "read"
@@ -15,21 +15,24 @@ jobs:
1515
verify_published_from_main_image: false
1616

1717
quality_checks:
18-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8399c1f015c1304e40771cbd8ccc24c7ed48fdbc
19-
needs: [get_config_values]
18+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
19+
needs: [ get_config_values ]
2020
permissions:
2121
contents: "read"
22+
packages: "read"
23+
id-token: "write"
2224
with:
2325
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
2426
secrets:
2527
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
2628

2729
tag_release:
28-
needs: [get_config_values]
29-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@68c2dea999875055ecbfdf055d8391e6e8b8ce2f
30+
needs: [ get_config_values ]
31+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
3032
permissions:
3133
id-token: "write"
3234
contents: "write"
35+
packages: "write"
3336
with:
3437
dry_run: true
3538
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.github/workflows/pull_request.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: pull_request
22

33
on:
44
pull_request:
5-
branches: [main]
5+
branches: [ main ]
66
permissions: {}
77
jobs:
88
get_config_values:
9-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@e798d5aee897de6f7dc387dd5623fcd9ba4c8929
9+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
1010
permissions:
1111
attestations: "read"
1212
contents: "read"
@@ -15,7 +15,7 @@ jobs:
1515
verify_published_from_main_image: false
1616

1717
dependabot-auto-approve-and-merge:
18-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@e798d5aee897de6f7dc387dd5623fcd9ba4c8929
18+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
1919
permissions:
2020
contents: "write"
2121
pull-requests: "write"
@@ -24,26 +24,29 @@ jobs:
2424
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
2525

2626
quality_checks:
27-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8399c1f015c1304e40771cbd8ccc24c7ed48fdbc
28-
needs: [get_config_values]
27+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
28+
needs: [ get_config_values ]
2929
permissions:
3030
contents: "read"
31+
packages: "read"
32+
id-token: "write"
3133
with:
3234
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
3335
secrets:
3436
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3537

3638
pr_title_format_check:
37-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@e798d5aee897de6f7dc387dd5623fcd9ba4c8929
39+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
3840
permissions:
3941
pull-requests: "write"
4042

4143
tag_release:
42-
needs: [get_config_values]
43-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@68c2dea999875055ecbfdf055d8391e6e8b8ce2f
44+
needs: [ get_config_values ]
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
4446
permissions:
4547
id-token: "write"
4648
contents: "write"
49+
packages: "write"
4750
with:
4851
dry_run: true
4952
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
permissions: {}
88
jobs:
99
get_config_values:
10-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@e798d5aee897de6f7dc387dd5623fcd9ba4c8929
10+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
1111
permissions:
1212
attestations: "read"
1313
contents: "read"
@@ -16,21 +16,24 @@ jobs:
1616
verify_published_from_main_image: false
1717

1818
quality_checks:
19-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8399c1f015c1304e40771cbd8ccc24c7ed48fdbc
20-
needs: [get_config_values]
19+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
20+
needs: [ get_config_values ]
2121
permissions:
2222
contents: "read"
23+
packages: "read"
24+
id-token: "write"
2325
with:
2426
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
2527
secrets:
2628
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
2729

2830
tag_release:
29-
needs: [get_config_values]
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@68c2dea999875055ecbfdf055d8391e6e8b8ce2f
31+
needs: [ get_config_values ]
32+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8b259f4f2d2b8ff1345fb0d2f9b9f0fbb9d19845
3133
permissions:
3234
id-token: "write"
3335
contents: "write"
36+
packages: "write"
3437
with:
3538
dry_run: false
3639
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

‎.pre-commit-config.yaml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,27 @@ repos:
2626
- id: zizmor-action
2727
name: Check action.yml
2828
entry: zizmor
29-
args: ["action.yml"]
29+
args: [ "action.yml" ]
3030
language: system
3131
files: action.yml
3232
pass_filenames: false
3333

3434
- id: lint-githubactions
3535
name: Lint github actions
3636
entry: make
37-
args: ["actionlint"]
37+
args: [ "actionlint" ]
3838
language: system
3939
files: ^.github
40-
types_or: [yaml]
40+
types_or: [ yaml ]
4141
pass_filenames: false
4242

4343
- id: lint-githubaction-scripts
4444
name: Lint github action scripts
4545
entry: make
46-
args: ["shellcheck"]
46+
args: [ "shellcheck" ]
4747
language: system
4848
files: ^.github/scripts
49-
types_or: [sh, shell]
49+
types_or: [ sh, shell ]
5050
pass_filenames: false
5151

5252
- id: check-commit-signing
@@ -78,14 +78,15 @@ repos:
7878
pass_filenames: false
7979
always_run: true
8080

81-
- id: git-secrets
82-
name: Git Secrets
83-
description: git-secrets scans commits, commit messages, and --no-ff merges to prevent adding secrets into your git repositories.
81+
- id: gitleasks
82+
name: Git Leaks
83+
description: gitleaks scans commits, commit messages, and --no-ff merges to
84+
prevent adding secrets into your git repositories.
8485
entry: bash
8586
args:
8687
- -c
87-
- "git-secrets --pre_commit_hook"
88+
- "gitleaks git --pre-commit --redact --staged --verbose"
8889
language: system
8990

9091
fail_fast: true
91-
default_stages: [pre-commit]
92+
default_stages: [ pre-commit ]

0 commit comments

Comments
 (0)