From 0d6bf9b49c086a9cabd9c3a185962c86f1a353af Mon Sep 17 00:00:00 2001 From: moldy Date: Fri, 1 Dec 2023 12:41:14 -0500 Subject: [PATCH] chore: change back to using development branch --- .github/PULL_REQUEST_TEMPLATE.md | 3 +-- .github/workflows/on-pull-request.yml | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 18082f2f19..2f415beaa7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,6 +5,5 @@ - [ ] Do your commits follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard? - [ ] Does your PR title also follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) standard? - [ ] If you have a breaking change, is it [correctly reflected in your commit message](https://www.conventionalcommits.org/en/v1.0.0/#examples)? (e.g. `feat!: breaking change`) -- [ ] Did you run lint (`yarn lint:check`) and fix any issues? (`yarn lint:fix`) -- [ ] Is the base branch you're merging into `development` and not `main`? +- [ ] Did you run lint (`yarn lint:check`) and fix any issues? (`yarn lint:write`) - [ ] Did you follow the [contribution guidelines](https://github.com/alchemyplatform/aa-sdk/blob/main/CONTRIBUTING.md)? diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml index 1a55bc204a..e8d04916ac 100644 --- a/.github/workflows/on-pull-request.yml +++ b/.github/workflows/on-pull-request.yml @@ -3,17 +3,6 @@ on: pull_request: jobs: - # admins are still able to override this check if we need to merge something ASAP - check_branch: - name: "Enforce development branch" - runs-on: ubuntu-latest - steps: - - name: Check branch - if: github.base_ref == 'main' && github.head_ref != 'development' - run: | - echo "ERROR: You can only merge to main from development." - exit 1 - enforce_title: name: Enforce PR Title Format runs-on: ubuntu-latest