Skip to content

Commit 5a5731e

Browse files
authored
Merge branch 'main' into update_java
2 parents f9f00bd + 2539257 commit 5a5731e

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
2727
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2828
quality_checks:
29-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
29+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@27a44fb54f4023136d2c14058e3256e73af9901e
3030
needs: [get_asdf_version]
3131
secrets:
3232
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -46,7 +46,7 @@ jobs:
4646
4747
tag_release:
4848
needs: [quality_checks, get_commit_id, get_asdf_version]
49-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@27a44fb54f4023136d2c14058e3256e73af9901e
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/pull_request.yml

Lines changed: 4 additions & 4 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@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@27a44fb54f4023136d2c14058e3256e73af9901e
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,7 +32,7 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@27a44fb54f4023136d2c14058e3256e73af9901e
3636
needs: [get_asdf_version]
3737
with:
3838
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -41,7 +41,7 @@ jobs:
4141
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4242

4343
pr_title_format_check:
44-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
44+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@27a44fb54f4023136d2c14058e3256e73af9901e
4545

4646
get_issue_number:
4747
runs-on: ubuntu-22.04
@@ -72,7 +72,7 @@ jobs:
7272

7373
tag_release:
7474
needs: [get_asdf_version]
75-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
75+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@27a44fb54f4023136d2c14058e3256e73af9901e
7676
with:
7777
dry_run: true
7878
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
2626
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2727
quality_checks:
28-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@27a44fb54f4023136d2c14058e3256e73af9901e
2929
needs: [get_asdf_version]
3030
secrets:
3131
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -45,7 +45,7 @@ jobs:
4545
4646
tag_release:
4747
needs: [quality_checks, get_commit_id, get_asdf_version]
48-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@27a44fb54f4023136d2c14058e3256e73af9901e
4949
with:
5050
dry_run: false
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

poetry.lock

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

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>io.github.hakky54</groupId>
4343
<artifactId>logcaptor</artifactId>
44-
<version>2.12.0</version>
44+
<version>2.12.2</version>
4545
<scope>test</scope>
4646
</dependency>
4747
<!--The

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ requests = "^2.32.5"
2121

2222
[tool.poetry.group.dev.dependencies]
2323
pre-commit = "^4.5.1"
24-
cfn-lint = "^1.43.3"
24+
cfn-lint = "^1.43.4"
2525

2626
[tool.poetry.scripts]

0 commit comments

Comments
 (0)