Skip to content

Commit e3104f9

Browse files
tstephen-nhststephen-nhs
authored
Merge branch 'main' into aea-6055-sc4
2 parents 0623b97 + 481ef41 commit e3104f9

23 files changed

Lines changed: 568 additions & 912 deletions

File tree

‎.devcontainer/Dockerfile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,16 @@ RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" = "aarch64" ]; then \
4444

4545
# Install ASDF
4646
RUN ASDF_VERSION=$(awk '!/^#/ && NF {print $1; exit}' /tmp/.tool-versions.asdf) && \
47-
wget -O /tmp/asdf.tar.gz https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-amd64.tar.gz; \
48-
tar -xvzf /tmp/asdf.tar.gz; \
49-
mv asdf /usr/bin
47+
if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then \
48+
wget -O /tmp/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-arm64.tar.gz"; \
49+
else \
50+
wget -O /tmp/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-amd64.tar.gz"; \
51+
fi && \
52+
tar -xzf /tmp/asdf.tar.gz -C /tmp && \
53+
mkdir -p /usr/bin && \
54+
mv /tmp/asdf /usr/bin/asdf && \
55+
chmod +x /usr/bin/asdf && \
56+
rm -rf /tmp/asdf.tar.gz
5057

5158
# specify DOCKER_GID to force container docker group id to match host
5259
RUN if [ -n "${DOCKER_GID}" ]; then \

‎.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
@@ -27,7 +27,7 @@ jobs:
2727
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2828
2929
quality_checks:
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
3131
needs: [get_asdf_version]
3232
with:
3333
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -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@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/delete_old_cloudformation_stacks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout local code
20-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2121
with:
2222
ref: ${{ env.BRANCH_NAME }}
2323
fetch-depth: 0
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout local code
47-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
47+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
4848
with:
4949
ref: ${{ env.BRANCH_NAME }}
5050
fetch-depth: 0

‎.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@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
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,15 +32,15 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/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@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
3636
needs: [get_asdf_version]
3737
with:
3838
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3939
secrets:
4040
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4141

4242
pr_title_format_check:
43-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
43+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
4444

4545
get_issue_number:
4646
runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
7171

7272
tag_release:
7373
needs: [get_asdf_version]
74-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
74+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
7575
with:
7676
dry_run: true
7777
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/cfg/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@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
2929
needs: [get_asdf_version]
3030
with:
3131
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -44,7 +44,7 @@ jobs:
4444
4545
tag_release:
4646
needs: [quality_checks, get_commit_id, get_asdf_version]
47-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a2edde3fb0e9816a25a5ba4923b4d509db83f552
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
4848
with:
4949
dry_run: false
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/run_package_code_and_api.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
packages: read
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
15+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
1616
with:
1717
ref: ${{ env.BRANCH_NAME }}
1818

‎.github/workflows/run_regression_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout local github actions
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2929
with:
3030
ref: ${{ env.BRANCH_NAME }}
3131
fetch-depth: 0

‎.github/workflows/run_release_code_and_api.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146

147147
steps:
148148
- name: Checkout local github actions
149-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
149+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
150150
with:
151151
ref: ${{ env.BRANCH_NAME }}
152152
fetch-depth: 0
@@ -318,7 +318,7 @@ jobs:
318318
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
319319

320320
- name: Checkout gh-pages
321-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
321+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
322322
with:
323323
ref: gh-pages
324324
path: gh-pages

0 commit comments

Comments
 (0)