diff --git a/.github/workflows/checkMergeCommits.yml b/.github/workflows/checkMergeCommits.yml deleted file mode 100644 index 371c075d8de..00000000000 --- a/.github/workflows/checkMergeCommits.yml +++ /dev/null @@ -1,18 +0,0 @@ -on: pull_request - -name: Check for merge commits - -permissions: - pull-requests: read - -jobs: - message-check: - name: Block Merge Commits - - runs-on: ubuntu-latest - - steps: - - name: Block Merge Commits - uses: Morishiri/block-merge-commits-action@a4554c78def8d874966a8d1e20e2971121443755 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index 83c07a9da0e..b0dd10ce08d 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -10,6 +10,10 @@ on: branches: [ master ] jobs: + check-freeze-period: + uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master + check-merge-commits: + uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master check-versions: uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master with: diff --git a/.github/workflows/verifyFreezePeriod.yml b/.github/workflows/verifyFreezePeriod.yml deleted file mode 100644 index fed6cc53c54..00000000000 --- a/.github/workflows/verifyFreezePeriod.yml +++ /dev/null @@ -1,12 +0,0 @@ -# This workflow calls the Code-Freeze-Period check - -name: Check Code Freeze Period - -on: - pull_request: - branches: - - 'master' - -jobs: - check-freeze-period: - uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/verifyFreezePeriod.yml@master