Skip to content

Commit

Permalink
Prepare 1.12.x-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Jul 6, 2024
1 parent 18cddd6 commit 30a51ac
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/apiref.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:
push:
branches:
- "1.11.x"
- "1.12.x"
paths:
- 'src/**'
- 'composer.lock'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/issue-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/merge-maintained-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Merge maintained branch
on:
push:
branches:
- "1.10.x"
- "1.11.x"

jobs:
merge:
Expand All @@ -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}'

0 comments on commit 30a51ac

Please sign in to comment.