diff --git a/.github/workflows/pull_request-checks.yml b/.github/workflows/pull_request-checks.yml index 39e281689..c5bf10220 100644 --- a/.github/workflows/pull_request-checks.yml +++ b/.github/workflows/pull_request-checks.yml @@ -10,7 +10,6 @@ on: - '!docs/**' - 'docs/bpmn-workflow-models/**' - '!.github/ISSUE_TEMPLATE/**' - workflow_dispatch: null env: GH_TOKEN: ${{ github.token }} @@ -46,54 +45,29 @@ jobs: - './backend/audit/models/**' - './backend/dissemination/models/**' - check-if-branch-is-ahead-of-main: - runs-on: ubuntu-latest - steps: - - name: Git checkout - uses: actions/checkout@v6 - with: - fetch-depth: 0 - - - name: Check if branch is ahead of main - run: | - if ! git merge-base --is-ancestor origin/main ${{ github.event.pull_request.head.sha }}; - then echo "This branch is not up to date with main"; - gh pr comment ${{ github.event.pull_request.number }} \ - --body "This pull request is not up to date with main. Please merge main into this brach or rebase this branch onto main. This PR should not be approved until all status checks pass. If you see this message, please rerun all status checks before merging." - exit 1; fi - # Tests and Linting invoked on a Pull Request testing-from-build: - needs: [check-for-changes, check-if-branch-is-ahead-of-main] + needs: [check-for-changes] if: ${{ needs.check-for-changes.outputs.requirements == 'true' || needs.check-for-changes.outputs.dev-requirements == 'true' || needs.check-for-changes.outputs.docker == 'true' || needs.check-for-changes.outputs.package == 'true' || needs.check-for-changes.outputs.staticfiles == 'true' }} uses: ./.github/workflows/testing-from-build.yml secrets: inherit testing-from-ghcr: - needs: [check-for-changes, check-if-branch-is-ahead-of-main] + needs: [check-for-changes] if: ${{ needs.check-for-changes.outputs.requirements != 'true' && needs.check-for-changes.outputs.dev-requirements != 'true' && needs.check-for-changes.outputs.docker != 'true' && needs.check-for-changes.outputs.package != 'true' && needs.check-for-changes.outputs.staticfiles != 'true' }} uses: ./.github/workflows/testing-from-ghcr.yml secrets: inherit cypress-from-container: - needs: [check-if-branch-is-ahead-of-main] uses: ./.github/workflows/testing-cypress-container.yml with: environment: testing secrets: inherit linting: - needs: [check-if-branch-is-ahead-of-main] uses: ./.github/workflows/pull_request-linting.yml secrets: inherit - # Update BPMN Diagrams - # We are removing this as we are not editing, and we do not wish for it to run with lib updates. - # Uncomment if changes to models are necessary - # sync-BPMN: - # uses: ./.github/workflows/add-bpmn-renders.yml - # secrets: inherit - # Generate Terraform Plans terraform-plan: if: ${{ github.base_ref == 'main' }} @@ -141,7 +115,7 @@ jobs: if: github.event_name == 'pull_request' validate-migrations: - needs: [check-for-changes, check-if-branch-is-ahead-of-main] + needs: [check-for-changes] if: ${{ needs.check-for-changes.outputs.requirements == 'true' || needs.check-for-changes.outputs.migration == 'true' }} uses: ./.github/workflows/validate-migrations.yml secrets: inherit