From b18270721110217cd51fdcc647a2afc26eb263a4 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 3 Mar 2023 09:59:52 +0100 Subject: [PATCH] use semantic branch naming --- .github/workflows/continuous-integration.yml | 4 +++- .github/workflows/static-analysis.yml | 4 +++- composer.json | 5 ----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index a6c1a2c5..3074febb 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -3,7 +3,9 @@ name: "CI" on: push: branches: - - master + - '[0-9]+.x' + - '[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.x' pull_request: jobs: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 8f796b5d..806e6f49 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -3,7 +3,9 @@ name: "Static analysis" on: push: branches: - - master + - '[0-9]+.x' + - '[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.x' pull_request: jobs: diff --git a/composer.json b/composer.json index e6d748c9..37760b68 100644 --- a/composer.json +++ b/composer.json @@ -76,11 +76,6 @@ "symfony/flex": true } }, - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "psr-4": { "Http\\HttplugBundle\\": "src/"