Skip to content

Commit

Permalink
adjust to semantic branch naming
Browse files Browse the repository at this point in the history
  • Loading branch information
dbu committed May 4, 2024
1 parent 511d1ff commit 801c982
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ $ composer show --latest 'symfony-cmf/*'
If it's an error message or piece of code, use code block tags,
and make sure you provide the whole stack trace(s),
not just the first error message you can see.
More details here: https://github.com/symfony-cmf/core-bundle/blob/master/CONTRIBUTING.md#issues
More details here: https://github.com/symfony-cmf/core-bundle/blob/3.x/CONTRIBUTING.md#issues
-->
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| Q | A
| ------------- | ---
| Branch? | "master" for new features / the branch of the current release for fixes
| Branch? | 3.x for new features / the branch of the current release for fixes
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
pull_request:
push:
branches:
- 'master'
- '[0-9]+.x'
- '[0-9]+.[0-9]+'
- '[0-9]+.[0-9]+.x'
Expand Down
8 changes: 1 addition & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,5 @@
"psr-4": {
"Symfony\\Cmf\\Bundle\\CoreBundle\\Tests\\": "tests/"
}
},
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
}
},
"minimum-stability": "dev"
}
}

0 comments on commit 801c982

Please sign in to comment.