Skip to content

Commit

Permalink
Prepare for 2.1.x-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Dec 21, 2024
1 parent 72b31c0 commit 46b9819
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/apiref.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
workflow_dispatch:
push:
branches:
- "2.0.x"
- "2.1.x"
paths:
- 'src/**'
- 'composer.lock'
- 'apigen/**'
- '.github/workflows/apiref.yml'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"
COMPOSER_ROOT_VERSION: "2.1.x-dev"

concurrency:
group: apigen-${{ github.ref }} # will be canceled on subsequent pushes in branch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/issue-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- 'changelog-generator/**'
push:
branches:
- "2.0.x"
- "2.1.x"
paths-ignore:
- 'compiler/**'
- 'apigen/**'
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:

- name: "Evaluate results - push"
working-directory: "issue-bot"
if: "github.repository_owner == 'phpstan' && github.ref == 'refs/heads/2.0.x'"
if: "github.repository_owner == 'phpstan' && github.ref == 'refs/heads/2.1.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/pr-base-on-previous-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
types:
- opened
branches:
- '2.1.x'
- '2.2.x'


jobs:
Expand All @@ -19,6 +19,6 @@ jobs:
- name: Comment PR
uses: peter-evans/create-or-update-comment@v4
with:
body: "You've opened the pull request against the latest branch 2.1.x. PHPStan 2.1 is not going to be released for months. If your code is relevant on 2.0.x and you want it to be released sooner, please rebase your pull request and change its target to 2.0.x."
body: "You've opened the pull request against the latest branch 2.2.x. PHPStan 2.2 is not going to be released for months. If your code is relevant on 2.1.x and you want it to be released sooner, please rebase your pull request and change its target to 2.1.x."
token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
issue-number: ${{ github.event.pull_request.number }}
2 changes: 1 addition & 1 deletion .github/workflows/update-phpstorm-stubs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: "Checkout"
uses: actions/checkout@v4
with:
ref: 2.0.x
ref: 2.1.x
fetch-depth: '0'
token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
- name: "Install PHP"
Expand Down

0 comments on commit 46b9819

Please sign in to comment.