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
4 changes: 2 additions & 2 deletions .github/workflows/continous-integration-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Install Python 3.10
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.10"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
# 1) Validate branch name without shell (no user data in `run`)
- name: Check ticket name conforms to requirements
id: validate
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
script: |
const ref = context.payload.pull_request.head.ref || '';
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Grab ticket name
if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')
id: ticket
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
# return the ticket in uppercase; becomes steps.ticket.outputs.result
result-encoding: string
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sbom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Setup Python 3.13
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.13"

- name: Setup Terraform
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd
uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85

- uses: terraform-linters/setup-tflint@ae78205cfffec9e8d93fd2b3115c7e9d3166d4b6
name: Setup TFLint
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
python .github/scripts/sbom_json_to_csv.py sbom.json SBOM_${REPO_NAME}.csv

- name: Upload SBOM CSV as artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: sbom-csv
path: SBOM_${{ github.event.repository.name }}.csv
Expand All @@ -92,7 +92,7 @@ jobs:


- name: Upload Vulnerability Report
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: grype-report
path: grype-report-${{ github.event.repository.name }}.csv
Expand All @@ -104,7 +104,7 @@ jobs:
python .github/scripts/sbom_packages_to_csv.py sbom.json $REPO_NAME

- name: Upload Package Inventory CSV
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: sbom-packages
path: sbom-packages-${{ github.event.repository.name }}.csv
35 changes: 19 additions & 16 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ pip-licenses = "^5.0.0"
jinja2 = "^3.1.6"
pytest = "^8.3.5"
coverage = "^7.8.0"
pytest-nhsd-apim = "^5.0.0"
pytest-nhsd-apim = "^6.0.7"



[tool.poetry.scripts]