diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml index ba4d43045..8e428b371 100644 --- a/.github/workflows/_deploy.yml +++ b/.github/workflows/_deploy.yml @@ -52,7 +52,7 @@ jobs: runs-on: [self-hosted, ci] needs: get-branch-from-workflow-file steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.SCOPE == 'per_workspace'}} @@ -81,7 +81,7 @@ jobs: needs: [get-branch-from-workflow-file, build] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -98,7 +98,7 @@ jobs: needs: [get-branch-from-workflow-file, terraform--init] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -116,7 +116,7 @@ jobs: environment: ${{ inputs.account }} runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -133,7 +133,7 @@ jobs: needs: [get-branch-from-workflow-file, terraform--apply] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/make/ @@ -157,7 +157,7 @@ jobs: needs: [get-branch-from-workflow-file, apigee--deploy] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.SCOPE == 'per_workspace' && (env.ACCOUNT == 'int' || env.ACCOUNT == 'prod') }} @@ -172,7 +172,7 @@ jobs: needs: [get-branch-from-workflow-file, apigee--deploy] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.ACCOUNT != 'mgmt' && env.ACCOUNT != 'backups' }} diff --git a/.github/workflows/_deploy_backups.yml b/.github/workflows/_deploy_backups.yml index 44f8258ef..7f7423cdc 100644 --- a/.github/workflows/_deploy_backups.yml +++ b/.github/workflows/_deploy_backups.yml @@ -51,7 +51,7 @@ jobs: runs-on: [self-hosted, ci] needs: get-branch-from-workflow-file steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - if: ${{ env.SCOPE == 'per_workspace'}} @@ -73,7 +73,7 @@ jobs: needs: [get-branch-from-workflow-file, build] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -90,7 +90,7 @@ jobs: needs: [get-branch-from-workflow-file, terraform--init] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ @@ -108,7 +108,7 @@ jobs: environment: ${{ inputs.account }} runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/terraform/ diff --git a/.github/workflows/destroy-expired-workspaces.yml b/.github/workflows/destroy-expired-workspaces.yml index 57c804dd8..2cd104915 100644 --- a/.github/workflows/destroy-expired-workspaces.yml +++ b/.github/workflows/destroy-expired-workspaces.yml @@ -28,7 +28,7 @@ jobs: runs-on: [self-hosted, ci] needs: [parse-secrets] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -42,7 +42,7 @@ jobs: needs: [build-base] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} diff --git a/.github/workflows/destroy-nonprod-workspace.yml b/.github/workflows/destroy-nonprod-workspace.yml index 8820a431f..8d907ff33 100644 --- a/.github/workflows/destroy-nonprod-workspace.yml +++ b/.github/workflows/destroy-nonprod-workspace.yml @@ -41,7 +41,7 @@ jobs: runs-on: [self-hosted, ci] needs: [get-branch-from-workflow-file] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - uses: ./.github/actions/make/ @@ -55,7 +55,7 @@ jobs: needs: [build-base] steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ needs.get-branch-from-workflow-file.outputs.branch_name }} - name: Destroy workspace diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index f1f9761d1..eb948a2aa 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -17,7 +17,7 @@ jobs: name: Create a tag from main steps: - name: Checkout the repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create 'env.tag' from the latest release run: | TAG=$(make changelog--get-latest-release) @@ -51,7 +51,7 @@ jobs: runs-on: [self-hosted, ci] needs: [create-coverage-name, make-tag] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: main - name: Download artifact diff --git a/.github/workflows/on-pr-close.yml b/.github/workflows/on-pr-close.yml index 0122748c0..409a6336e 100644 --- a/.github/workflows/on-pr-close.yml +++ b/.github/workflows/on-pr-close.yml @@ -28,13 +28,13 @@ jobs: steps: - name: Checkout Branch id: checkout-build-branch - uses: actions/checkout@v4 + uses: actions/checkout@v6 continue-on-error: true with: ref: ${{ env.BRANCH_NAME }} - name: Fallback to main if: steps.checkout-build-branch.outcome == 'failure' - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: main - uses: ./.github/actions/make/ @@ -49,13 +49,13 @@ jobs: steps: - name: Checkout Branch for destroy id: checkout-destroy-branch - uses: actions/checkout@v4 + uses: actions/checkout@v6 continue-on-error: true with: ref: ${{ env.BRANCH_NAME }} - name: Fallback to main for destroy if: steps.checkout-destroy-branch.outcome == 'failure' - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: main fetch-depth: 0 diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml index 1a3a88888..5b27445ee 100644 --- a/.github/workflows/pull-requests.yml +++ b/.github/workflows/pull-requests.yml @@ -20,7 +20,7 @@ jobs: workflow--check--branch-name: runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -30,7 +30,7 @@ jobs: workflow--check--rebased-on-main: runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - uses: ./.github/actions/make/ @@ -40,7 +40,7 @@ jobs: workflow--check--release-branch-name: runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ github.event.pull_request.head.ref }} - uses: ./.github/actions/make/ @@ -76,7 +76,7 @@ jobs: runs-on: [self-hosted, ci] needs: [parse-secrets] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -89,7 +89,7 @@ jobs: runs-on: [self-hosted, ci] needs: [workflow--check--branch-name] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BASE_BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -103,7 +103,7 @@ jobs: runs-on: [self-hosted, ci] needs: [build-head] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -117,7 +117,7 @@ jobs: matrix: test-type: [unit, slow] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/pytest-with-rerun/ @@ -128,7 +128,7 @@ jobs: needs: [build-head] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -139,7 +139,7 @@ jobs: needs: [create-workspace-name, build-base, parse-secrets] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BASE_BRANCH_NAME }} - uses: ./.github/actions/terraform/ @@ -168,7 +168,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/terraform/ @@ -186,7 +186,7 @@ jobs: needs: [build-head, terraform-head-build] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -200,7 +200,7 @@ jobs: needs: [build-head, apigee--deploy] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - run: | @@ -227,7 +227,7 @@ jobs: matrix: test-type: [integration] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/pytest-with-rerun/ @@ -247,7 +247,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -270,7 +270,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -305,7 +305,7 @@ jobs: ] runs-on: [self-hosted, ci] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -335,7 +335,7 @@ jobs: runs-on: [self-hosted, ci] if: ${{ needs.apigee--attach-product.result == 'success' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - run: | @@ -352,7 +352,7 @@ jobs: runs-on: [self-hosted, ci] if: ${{ needs.apigee--deploy.result == 'success' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} - uses: ./.github/actions/make/ @@ -366,7 +366,7 @@ jobs: runs-on: [self-hosted, ci] needs: [build-head] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ env.BRANCH_NAME }} fetch-depth: 0 diff --git a/.tool-versions b/.tool-versions index 64ecaee68..213447ba9 100644 --- a/.tool-versions +++ b/.tool-versions @@ -4,5 +4,5 @@ python 3.12.3 terraform 1.5.7 jq 1.7 yq 4.34.2 -nodejs 20.9.0 +nodejs 20.19.0 java zulu-jre-17.42.19 diff --git a/CHANGELOG.md b/CHANGELOG.md index e882ba3e3..2950adcdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 2025-12-11 +- Dependabot: github-actions + ## 2025-07-21 - Create new tag diff --git a/VERSION b/VERSION index 7da1e54ee..8870b8e19 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2025.07.21 +2025.12.11 diff --git a/changelog/2025-12-11.md b/changelog/2025-12-11.md new file mode 100644 index 000000000..3dc30849c --- /dev/null +++ b/changelog/2025-12-11.md @@ -0,0 +1 @@ +- Dependabot: github-actions diff --git a/infrastructure/swagger/07_components--schemas--domain.yaml b/infrastructure/swagger/07_components--schemas--domain.yaml index 762c36d59..57d9ae7bb 100644 --- a/infrastructure/swagger/07_components--schemas--domain.yaml +++ b/infrastructure/swagger/07_components--schemas--domain.yaml @@ -16,7 +16,7 @@ components: message: type: string StatusOK: - type: string + type: object properties: code: type: string diff --git a/infrastructure/swagger/08_components--schemas--other.yaml b/infrastructure/swagger/08_components--schemas--other.yaml index 9b2979f48..96e073e44 100644 --- a/infrastructure/swagger/08_components--schemas--other.yaml +++ b/infrastructure/swagger/08_components--schemas--other.yaml @@ -4,7 +4,7 @@ components: HeaderVersion: type: string pattern: "^[1-9][0-9]?(\\.[0-9])?$" - example: 1 + example: "1" HeaderRequestId: type: string diff --git a/pyproject.toml b/pyproject.toml index 0352366ad..8eb539298 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "connecting-party-manager" -version = "2025.07.21" +version = "2025.12.11" description = "Repository for the Connecting Party Manager API and related services" authors = ["NHS England"] license = "LICENSE.md"