diff --git a/.github/workflows/add-bpmn-renders.yml b/.github/workflows/add-bpmn-renders.yml index 99e515eeb9..ad278dfdc7 100644 --- a/.github/workflows/add-bpmn-renders.yml +++ b/.github/workflows/add-bpmn-renders.yml @@ -12,11 +12,14 @@ name: Lint BPMN on: workflow_call: +env: + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + jobs: diagrams-up-to-date: # Check that the PR is not raised by this workflow (avoiding recursion) and # is not from a fork - if: startsWith(github.head_ref, 'auto/bpmn-patches') == false && github.event.pull_request.head.repo.full_name == github.repository + if: startsWith(github.event.pull_request.head.ref, 'auto/bpmn-patches') == false && github.event.pull_request.head.repo.full_name == github.repository runs-on: ubuntu-latest steps: - name: Checkout @@ -40,7 +43,7 @@ jobs: - name: Check For Changes id: vars run: | - branchname="bpmn-patches/${{ github.head_ref }}" + branchname="bpmn-patches/${{ env.BRANCH_NAME }}" echo "branchname=${branchname}" >> $GITHUB_OUTPUT imagesupdated=$(git status --porcelain | cut -d ' ' -f 2 | wc -l) echo "imagesupdated=${imagesupdated}" >> $GITHUB_OUTPUT @@ -49,12 +52,12 @@ jobs: if: steps.vars.outputs.imagesupdated != 0 uses: peter-evans/create-pull-request@v5 with: - commit-message: Update BPMN images for ${{ github.head_ref }} - title: Update BPMN images for ${{ github.head_ref }} - body: This is an auto-generated PR to sync BPMN images with their source on ${{ github.head_ref }}. + commit-message: Update BPMN images for ${{ env.BRANCH_NAME }} + title: Update BPMN images for ${{ env.BRANCH_NAME }} + body: This is an auto-generated PR to sync BPMN images with their source on ${{ env.BRANCH_NAME }}. labels: bpmn-to-image, automated pr branch: ${{ steps.vars.outputs.branchname }} - base: ${{ github.head_ref }} + base: ${{ env.BRANCH_NAME }} - name: Update Changes if: steps.vars.outputs.imagesupdated != 0 @@ -66,7 +69,7 @@ jobs: A PR stops confusion... I got ya partner. - (...merge PR #${{ env.PULL_REQUEST_NUMBER }}...) + (...merge PR #${{ github.event.pull_request.number }}...) - name: Fail if images are not in sync with source if: steps.vars.outputs.imagesupdated != 0 diff --git a/.github/workflows/deploy-application.yml b/.github/workflows/deploy-application.yml index de28ed20a8..91ec175798 100644 --- a/.github/workflows/deploy-application.yml +++ b/.github/workflows/deploy-application.yml @@ -30,7 +30,7 @@ jobs: fac-build- - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index d439334c44..3792b041ef 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -24,7 +24,7 @@ jobs: fac-build- - name: Set up Python 3.10 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index ab65b5be94..70f5a09c4a 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -52,7 +52,7 @@ jobs: ignore-unfixed: true - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' @@ -87,6 +87,6 @@ jobs: ignore-unfixed: true - name: Upload Trivy scan results to GitHub Security tab for Third Party Images - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' diff --git a/backend/audit/templates/audit/auditor-certification-step-1.html b/backend/audit/templates/audit/auditor-certification-step-1.html index afe7763d76..620b327bc0 100644 --- a/backend/audit/templates/audit/auditor-certification-step-1.html +++ b/backend/audit/templates/audit/auditor-certification-step-1.html @@ -62,7 +62,7 @@