Skip to content

Commit a9eae6d

Browse files
anthony-nhsanthony-nhs
authored
Merge branch 'main' into dependabot/maven/io.github.hakky54-logcaptor-2.12.2
2 parents d0468c0 + 60d76af commit a9eae6d

File tree

8 files changed

+29
-26
lines changed

8 files changed

+29
-26
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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/delete_old_cloudformation_stacks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ 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: |

‎.github/workflows/pull_request.yml‎

Lines changed: 5 additions & 5 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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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 }}
@@ -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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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: 3 additions & 3 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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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@a2edde3fb0e9816a25a5ba4923b4d509db83f552
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 }}

‎.github/workflows/sam_package_code.yml‎

Lines changed: 1 addition & 1 deletion
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

‎.github/workflows/sam_release_code.yml‎

Lines changed: 11 additions & 8 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
@@ -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 [email protected]
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: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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)