Skip to content

Commit ced36fa

Browse files
connoravo-nhsconnoravo-nhs
authored
Merge branch 'main' into aea-0000-trivy-ignore-fasterxml
2 parents 726a792 + 08604ba commit ced36fa

9 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
1919

2020
- name: Get asdf version
2121
id: asdf-version
@@ -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@9791a77de7b005056b4ddfb9789306f5179f53da
29+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
3030
needs: [get_asdf_version]
3131
secrets:
3232
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -46,12 +46,11 @@ 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@9791a77de7b005056b4ddfb9789306f5179f53da
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
5353
branch_name: main
54-
publish_package: false
5554
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
5655
secrets: inherit
5756

‎.github/workflows/delete_old_cloudformation_stacks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
# Steps represent a sequence of tasks that will be executed as part of the job
2020
steps:
2121
- name: Checkout local github scripts
22-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2323
with:
2424
ref: ${{ env.BRANCH_NAME }}
2525
sparse-checkout: |
2626
.github/scripts
2727
2828
- name: Configure AWS Credentials
29-
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
29+
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
3030
with:
3131
aws-region: eu-west-2
3232
role-to-assume: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}

‎.github/workflows/pull_request.yml‎

Lines changed: 5 additions & 6 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@9791a77de7b005056b4ddfb9789306f5179f53da
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -21,7 +21,7 @@ jobs:
2121
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2525

2626
- name: Get asdf version
2727
id: asdf-version
@@ -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@9791a77de7b005056b4ddfb9789306f5179f53da
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
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@9791a77de7b005056b4ddfb9789306f5179f53da
44+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
4545

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

7373
tag_release:
7474
needs: [get_asdf_version]
75-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@9791a77de7b005056b4ddfb9789306f5179f53da
75+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
7676
with:
7777
dry_run: true
7878
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
7979
branch_name: ${{ github.event.pull_request.head.ref }}
80-
publish_package: false
8180
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
8281
secrets: inherit
8382

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
17+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
1818

1919
- name: Get asdf version
2020
id: asdf-version
@@ -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@9791a77de7b005056b4ddfb9789306f5179f53da
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
2929
needs: [get_asdf_version]
3030
secrets:
3131
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -45,12 +45,11 @@ 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@9791a77de7b005056b4ddfb9789306f5179f53da
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
4949
with:
5050
dry_run: false
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
5252
branch_name: main
53-
publish_package: false
5453
tag_format: ${{ needs.get_asdf_version.outputs.tag_format }}
5554
secrets: inherit
5655

‎.github/workflows/sam_package_code.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
java-version: "21"
1717
distribution: "adopt"
1818
- name: Checkout code
19-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2020
with:
2121
ref: ${{ env.BRANCH_NAME }}
2222
- name: Get asdf version
@@ -30,7 +30,7 @@ jobs:
3030
asdf_version: ${{ steps.asdf-version.outputs.version }}
3131

3232
- name: Cache asdf
33-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
33+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
3434
with:
3535
path: |
3636
~/.asdf

‎.github/workflows/sam_release_code.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464

6565
steps:
6666
- name: Checkout local github actions
67-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
67+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
6868
with:
6969
ref: ${{ env.BRANCH_NAME }}
7070
fetch-depth: 0
@@ -84,7 +84,7 @@ jobs:
8484
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
8585

8686
- name: Configure AWS Credentials
87-
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
87+
uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
8888
with:
8989
aws-region: eu-west-2
9090
role-to-assume: ${{ secrets.CLOUD_FORMATION_DEPLOY_ROLE }}
@@ -141,7 +141,7 @@ jobs:
141141
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
142142

143143
- name: Checkout gh-pages
144-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
144+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
145145
with:
146146
ref: gh-pages
147147
path: gh-pages
@@ -151,12 +151,15 @@ jobs:
151151
run: |
152152
cd gh-pages
153153
NOW=$(date +'%Y-%m-%dT%H:%M:%S')
154-
echo "tag,release_datetime" > _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
155-
echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
156-
echo "${{ inputs.VERSION_NUMBER }},${NOW}" >> _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
154+
echo "tag,release_datetime" > "_data/${TARGET_ENVIRONMENT}_latest.csv"
155+
echo "${VERSION_NUMBER},${NOW}" >> "_data/${TARGET_ENVIRONMENT}_latest.csv"
156+
echo "${VERSION_NUMBER},${NOW}" >> "_data/${TARGET_ENVIRONMENT}_deployments.csv"
157157
git config user.name github-actions
158158
git config user.email github-actions@github.com
159-
git add _data/${{ inputs.TARGET_ENVIRONMENT }}_latest.csv
160-
git add _data/${{ inputs.TARGET_ENVIRONMENT }}_deployments.csv
161-
git commit -m 'update releases for ${{ inputs.TARGET_ENVIRONMENT }}'
159+
git add "_data/${TARGET_ENVIRONMENT}_latest.csv"
160+
git add "_data/${TARGET_ENVIRONMENT}_deployments.csv"
161+
git commit -m "update releases for ${TARGET_ENVIRONMENT}"
162162
parallel --retries 10 --delay 3 ::: "git pull --rebase && git push"
163+
env:
164+
VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
165+
TARGET_ENVIRONMENT: ${{ inputs.TARGET_ENVIRONMENT }}

‎poetry.lock‎

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

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.junit</groupId>
3333
<artifactId>junit-bom</artifactId>
34-
<version>6.0.2</version>
34+
<version>6.0.3</version>
3535
<type>pom</type>
3636
<scope>import</scope>
3737
</dependency>
@@ -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.5</version>
4545
<scope>test</scope>
4646
</dependency>
4747
<!--The
@@ -89,7 +89,7 @@
8989
<dependency>
9090
<groupId>com.amazonaws</groupId>
9191
<artifactId>aws-lambda-java-log4j2</artifactId>
92-
<version>1.6.1</version>
92+
<version>1.6.2</version>
9393
</dependency>
9494
<dependency>
9595
<groupId>com.google.code.gson</groupId>
@@ -177,15 +177,15 @@
177177
<plugins>
178178
<plugin>
179179
<artifactId>maven-dependency-plugin</artifactId>
180-
<version>3.9.0</version>
180+
<version>3.10.0</version>
181181
</plugin>
182182
<plugin>
183183
<artifactId>maven-compiler-plugin</artifactId>
184-
<version>3.14.1</version>
184+
<version>3.15.0</version>
185185
</plugin>
186186
<plugin>
187187
<artifactId>maven-surefire-plugin</artifactId>
188-
<version>3.5.4</version>
188+
<version>3.5.5</version>
189189
</plugin>
190190
<plugin>
191191
<groupId>dev.aspectj</groupId>

‎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.2"
24+
cfn-lint = "^1.44.0"
2525

2626
[tool.poetry.scripts]

0 commit comments

Comments
 (0)