diff options
| author | Ran Benita <ran@unusedvar.com> | 2020-01-25 16:31:21 +0200 |
|---|---|---|
| committer | Ran Benita <ran@unusedvar.com> | 2020-02-12 09:49:21 +0200 |
| commit | c3e53a072d99fe799a932d75ef180bae8f14531f (patch) | |
| tree | f7da68148d8db99c31edb7c0b0e50201ff7c482a /.github | |
| parent | 0ee007ca33253758348e51130a7a2f9d92e31f1f (diff) | |
| download | pytest-c3e53a072d99fe799a932d75ef180bae8f14531f.tar.gz | |
Switch to new git workflow
Co-Authored-By: Daniel Hahler <git@thequod.de>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 2 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2e221f73e..d189f7869 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,8 +3,6 @@ Thanks for submitting a PR, your contribution is really appreciated! Here is a quick checklist that should be present in PRs. -- [ ] Target the `master` branch for bug fixes, documentation updates and trivial changes. -- [ ] Target the `features` branch for new features, improvements, and removals/deprecations. - [ ] Include documentation when adding new features. - [ ] Include new tests or update existing tests when applicable. - [X] Allow maintainers to push and squash when merging my commits. Please uncheck this if you prefer to squash the commits yourself. diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 242c2eb83..a8a9c527b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,12 +10,14 @@ on: push: branches: - master + - "[0-9]+.[0-9]+.x" tags: - "*" pull_request: branches: - master + - "[0-9]+.[0-9]+.x" jobs: build: |