Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/acceptance-tests/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ runs:

steps:
- name: Fetch terraform output
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: terraform-output-${{ inputs.targetComponent }}

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-docs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ runs:
using: "composite"
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- uses: actions/setup-node@v4
with:
node-version: 18
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/create-lines-of-code-report/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
run: zip lines-of-code-report.json.zip lines-of-code-report.json
- name: "Upload CLOC report as an artefact"
if: ${{ !env.ACT }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: lines-of-code-report.json.zip
path: ./lines-of-code-report.json.zip
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/scan-dependencies/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ runs:
run: zip sbom-repository-report.json.zip sbom-repository-report.json
- name: "Upload SBOM report as an artefact"
if: ${{ !env.ACT }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: sbom-repository-report.json.zip
path: ./sbom-repository-report.json.zip
Expand All @@ -47,7 +47,7 @@ runs:
run: zip vulnerabilities-repository-report.json.zip vulnerabilities-repository-report.json
- name: "Upload vulnerabilities report as an artefact"
if: ${{ !env.ACT }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: vulnerabilities-repository-report.json.zip
path: ./vulnerabilities-repository-report.json.zip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cicd-1-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
#skip_trivy_package: ${{ steps.skip_trivy.outputs.skip_trivy_package }}
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Set CI/CD variables"
id: variables
run: |
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}
APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
steps:
- uses: actions/checkout@v5.0.0
- uses: actions/checkout@v6
- name: Trigger dynamic environment creation
shell: bash
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cicd-3-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# tag: ${{ steps.variables.outputs.tag }}
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Set CI/CD variables"
id: variables
run: |
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
needs: metadata
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Get version"
id: get-asset-version
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
run: |
gh release download ${{steps.get-asset-version.outputs.release_version}} -p jekyll-docs-*.tar --output artifact.tar

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v6
with:
name: jekyll-docs-${{steps.get-asset-version.outputs.release_version}}
path: artifact.tar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v5.0.0
uses: actions/checkout@v6

- name: Updating Main Environment
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_destroy_dynamic_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v5.0.0
- uses: actions/checkout@v6
- name: Trigger dynamic environment destroy
env:
APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v5.0.0
uses: actions/checkout@v6

- name: Updating Main Environment
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scheduled-repository-template-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- name: Check out the repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Check out external repository
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: NHSDigital/nhs-notify-repository-template
path: nhs-notify-repository-template
Expand All @@ -32,7 +32,7 @@ jobs:

- name: Create Pull Request
if: ${{ !env.ACT }}
uses: peter-evans/create-pull-request@v7.0.8
uses: peter-evans/create-pull-request@v8
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Drift from template
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
with:
persist-credentials: false

Expand All @@ -59,7 +59,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: SARIF file
path: results.sarif
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/stage-1-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to scan all commits
- name: "Scan secrets"
Expand All @@ -55,7 +55,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check file format"
Expand All @@ -66,7 +66,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check Markdown format"
Expand All @@ -80,7 +80,7 @@ jobs:
contents: write
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check to see if Terraform Docs are up-to-date"
Expand All @@ -101,7 +101,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check English usage"
Expand All @@ -112,7 +112,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to compare branches
- name: "Check TODO usage"
Expand All @@ -124,7 +124,7 @@ jobs:
terraform_changed: ${{ steps.check.outputs.terraform_changed }}
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: "Check for Terraform changes"
id: check
Expand All @@ -148,7 +148,7 @@ jobs:
if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Setup ASDF"
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
- name: "Lint Terraform"
Expand All @@ -164,7 +164,7 @@ jobs:
# if: needs.detect-terraform-changes.outputs.terraform_changed == 'true'
# steps:
# - name: "Checkout code"
# uses: actions/checkout@v4
# uses: actions/checkout@v6
# - name: "Setup ASDF"
# uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
# - name: "Trivy IaC Scan"
Expand All @@ -178,7 +178,7 @@ jobs:
# timeout-minutes: 10
# steps:
# - name: "Checkout code"
# uses: actions/checkout@v4
# uses: actions/checkout@v6
# - name: "Setup ASDF"
# uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
# - name: "Trivy Package Scan"
Expand All @@ -192,7 +192,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Count lines of code"
uses: ./.github/actions/create-lines-of-code-report
with:
Expand All @@ -211,7 +211,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Scan dependencies"
uses: ./.github/actions/scan-dependencies
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/stage-2-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Repo setup"
run: |
npm ci
Expand All @@ -61,7 +61,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Repo setup"
run: |
npm ci
Expand All @@ -72,14 +72,14 @@ jobs:
run: |
make test-unit
- name: "Save the result of fast test suite"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: unit-tests
path: "**/.reports/unit"
include-hidden-files: true
if: always()
- name: "Save the result of code coverage"
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: code-coverage-report
path: ".reports/lcov.info"
Expand All @@ -89,7 +89,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Repo setup"
run: |
npm ci
Expand All @@ -105,7 +105,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Repo setup"
run: |
npm ci
Expand All @@ -122,7 +122,7 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Run test coverage check"
run: |
make test-coverage
Expand All @@ -139,11 +139,11 @@ jobs:
timeout-minutes: 5
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0 # Full history is needed to improving relevancy of reporting
- name: "Download coverage report for SONAR"
uses: actions/download-artifact@v4
uses: actions/download-artifact@v7
with:
name: code-coverage-report
- name: "Perform static analysis"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stage-3-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
timeout-minutes: 3
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Build docs"
uses: ./.github/actions/build-docs
with:
Expand All @@ -50,7 +50,7 @@ jobs:
timeout-minutes: 3
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Build artefact 1"
run: |
echo "Building artefact 1 ..."
Expand All @@ -67,7 +67,7 @@ jobs:
timeout-minutes: 3
steps:
- name: "Checkout code"
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: "Build artefact n"
run: |
echo "Building artefact n ..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stage-4-acceptance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
name: Run Acceptance Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: "Use Node.js"
uses: actions/setup-node@v4
Expand Down
Loading
Loading