From 30a51ac5089dc92a7e106286b75ec1f86ac7a648 Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Sat, 6 Jul 2024 19:39:40 +0200 Subject: [PATCH] Prepare 1.12.x-dev --- .github/workflows/apiref.yml | 2 +- .github/workflows/issue-bot.yml | 6 +++--- .github/workflows/merge-maintained-branch.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/apiref.yml b/.github/workflows/apiref.yml index 07e59496e9..36b9730690 100644 --- a/.github/workflows/apiref.yml +++ b/.github/workflows/apiref.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: push: branches: - - "1.11.x" + - "1.12.x" paths: - 'src/**' - 'composer.lock' diff --git a/.github/workflows/issue-bot.yml b/.github/workflows/issue-bot.yml index 7a30c152db..df03ddeb72 100644 --- a/.github/workflows/issue-bot.yml +++ b/.github/workflows/issue-bot.yml @@ -11,14 +11,14 @@ on: - 'changelog-generator/**' push: branches: - - "1.11.x" + - "1.12.x" paths-ignore: - 'compiler/**' - 'apigen/**' - 'changelog-generator/**' env: - COMPOSER_ROOT_VERSION: "1.11.x-dev" + COMPOSER_ROOT_VERSION: "1.12.x-dev" concurrency: group: run-issue-bot-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches @@ -167,7 +167,7 @@ jobs: - name: "Evaluate results - push" working-directory: "issue-bot" - if: "github.repository_owner == 'phpstan' && github.ref == 'refs/heads/1.11.x'" + if: "github.repository_owner == 'phpstan' && github.ref == 'refs/heads/1.12.x'" env: GITHUB_PAT: ${{ secrets.PHPSTAN_BOT_TOKEN }} PHPSTAN_SRC_COMMIT_BEFORE: ${{ github.event.before }} diff --git a/.github/workflows/merge-maintained-branch.yml b/.github/workflows/merge-maintained-branch.yml index 7c7cb8f853..4b609e26e2 100644 --- a/.github/workflows/merge-maintained-branch.yml +++ b/.github/workflows/merge-maintained-branch.yml @@ -5,7 +5,7 @@ name: Merge maintained branch on: push: branches: - - "1.10.x" + - "1.11.x" jobs: merge: @@ -20,5 +20,5 @@ jobs: with: github_token: "${{ secrets.PHPSTAN_BOT_TOKEN }}" source_ref: ${{ github.ref }} - target_branch: '1.11.x' + target_branch: '1.12.x' commit_message_template: 'Merge branch {source_ref} into {target_branch}'