From 801c98272a0ea109dd229d6021d247f71f30687d Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Sat, 4 May 2024 21:41:57 +0200 Subject: [PATCH] adjust to semantic branch naming --- .github/ISSUE_TEMPLATE.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/test-application.yaml | 1 - composer.json | 8 +------- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 7c5a6e9c..06781b34 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -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 --> diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0d8f7f77..79bf7e30 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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 diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 2bffe7f1..83be1371 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -4,7 +4,6 @@ on: pull_request: push: branches: - - 'master' - '[0-9]+.x' - '[0-9]+.[0-9]+' - '[0-9]+.[0-9]+.x' diff --git a/composer.json b/composer.json index 95ae74c5..25423cbd 100644 --- a/composer.json +++ b/composer.json @@ -56,11 +56,5 @@ "psr-4": { "Symfony\\Cmf\\Bundle\\CoreBundle\\Tests\\": "tests/" } - }, - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "minimum-stability": "dev" + } }