From 94b015363683a51af4a4dcbccf0b94c5f1f6886f Mon Sep 17 00:00:00 2001 From: Karsten Hassel Date: Wed, 10 Dec 2025 20:41:03 +0100 Subject: [PATCH] update Enforce Pull-Request Rules --- .../workflows/enforce-pullrequest-rules.yaml | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/enforce-pullrequest-rules.yaml b/.github/workflows/enforce-pullrequest-rules.yaml index eda5b22429..85ae4496a2 100644 --- a/.github/workflows/enforce-pullrequest-rules.yaml +++ b/.github/workflows/enforce-pullrequest-rules.yaml @@ -1,22 +1,26 @@ # This workflow enforces on every pull request that the PR is not based against master, -# taken from https://github.com/oppia/oppia-android/pull/2832/files +# taken from https://github.com/oppia/oppia-android/blob/develop/.github/workflows/static_checks.yml name: "Enforce Pull-Request Rules" on: - pull_request_target: - types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled] + pull_request: + push: + branches-ignore: + - develop + - master jobs: check: runs-on: ubuntu-latest + if: github.event_name == 'pull_request' timeout-minutes: 10 steps: - - name: "Enforce develop branch" - if: ${{ github.event.pull_request.base.ref == 'master' && !contains(github.event.pull_request.labels.*.name, 'mastermerge') }} + - name: "Branch is not based on develop" + if: ${{ github.base_ref != 'develop' && !contains(github.event.pull_request.labels.*.name, 'mastermerge') }} run: | - echo "This PR is based against the master branch and not a release or hotfix." - echo "Please don't do this. Switch the branch to 'develop'." + echo "Current base branch: $BASE_BRANCH" + echo "Note: PRs should only ever be merged into develop so please rebase your branch on develop and try again." exit 1 env: - BASE_BRANCH: ${{ github.event.pull_request.base.ref }} + BASE_BRANCH: ${{ github.base_ref }}