Skip to content

Commit 633e535

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/npm-11.6.3
2 parents 3c0c722 + 64b8ce4 commit 633e535

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
dependabot-auto-approve-and-merge:
1212
needs: quality_checks
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@ba86b0c6a2a3d4b87398e538e410cec90f57133d
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -33,7 +33,7 @@ jobs:
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
3535
quality_checks:
36-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@ba86b0c6a2a3d4b87398e538e410cec90f57133d
36+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@cf765bb1264f0f44fba00516bd0412ac792d37c9
3737
needs: [get_asdf_version]
3838
with:
3939
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -53,7 +53,7 @@ jobs:
5353
id: "Pull Request Basic Regression Tests"
5454
tag_release:
5555
needs: [get_asdf_version]
56-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@8243c6b1e493c00f2285339039ab8748b4212a64
56+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
5757
with:
5858
dry_run: true
5959
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/regression_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149

150150
# using git commit sha for version of action to ensure we have stable version
151151
- name: Install asdf
152-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
152+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
153153
with:
154154
asdf_version: ${{ steps.asdf-version.outputs.version }}
155155

@@ -161,7 +161,7 @@ jobs:
161161
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
162162

163163
- name: Install asdf dependencies in .tool-versions
164-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
164+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
165165
with:
166166
asdf_version: ${{ steps.asdf-version.outputs.version }}
167167
env:
@@ -323,7 +323,7 @@ jobs:
323323

324324
# using git commit sha for version of action to ensure we have stable version
325325
- name: Install asdf
326-
uses: asdf-vm/actions/setup@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
326+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
327327
with:
328328
asdf_version: ${{ steps.asdf-version.outputs.version }}
329329

@@ -335,7 +335,7 @@ jobs:
335335
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
336336

337337
- name: Install asdf dependencies in .tool-versions
338-
uses: asdf-vm/actions/install@9cd779f40fe38688dd19505ccbc4eaaf018b44e7
338+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
339339
with:
340340
asdf_version: 0.16.4
341341
env:

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
2929
quality_checks:
3030
needs: [get_asdf_version]
31-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@ba86b0c6a2a3d4b87398e538e410cec90f57133d
31+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@cf765bb1264f0f44fba00516bd0412ac792d37c9
3232
with:
3333
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3434
reinstall_poetry: true
@@ -46,7 +46,7 @@ jobs:
4646
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
4747
tag_release:
4848
needs: [quality_checks, get_commit_id, get_asdf_version]
49-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
5050
with:
5151
dry_run: false
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -69,7 +69,7 @@ jobs:
6969
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
7070

7171
- name: Install asdf
72-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
72+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
7373
with:
7474
asdf_version: ${{ steps.asdf-version.outputs.version }}
7575

@@ -81,7 +81,7 @@ jobs:
8181
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
8282

8383
- name: Install asdf dependencies in .tool-versions
84-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
84+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
8585
with:
8686
asdf_version: ${{ steps.asdf-version.outputs.version }}
8787
env:

poetry.lock

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

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ semver = "^3.0.4"
1919
gitpython = "^3.1.45"
2020
pip-licenses = "^5.5.0"
2121
flake8 = "^7.3.0"
22-
pre-commit = "^4.3.0"
22+
pre-commit = "^4.4.0"
2323
isort = "^7.0.0"
2424
cryptography = "^46.0.3"
2525
python-dateutil = "^2.9.0.post0"
@@ -36,7 +36,7 @@ boto3 = "^1.41.1"
3636

3737

3838
[tool.poetry.group.dev.dependencies]
39-
pre-commit = "^4.3.0"
39+
pre-commit = "^4.4.0"
4040

4141
[tool.pyright]
4242
include = ["features", "methods", "messages", "scripts", "pages", "utils"]

0 commit comments

Comments
 (0)