Skip to content

Commit

Permalink
Open 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 c376c8b
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/backward-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ on:
pull_request:
push:
branches:
- "1.11.x"
- "1.12.x"
paths:
- 'src/**'
- '.github/workflows/backward-compatibility.yml'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: bc-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-issue-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ on:
- '.github/workflows/build-issue-bot.yml'
push:
branches:
- "1.11.x"
- "1.12.x"
paths:
- 'issue-bot/**'
- '.github/workflows/build-issue-bot.yml'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: build-issue-bot-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/changelog-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ on:
- '.github/workflows/changelog-generator.yml'
push:
branches:
- "1.11.x"
- "1.12.x"
paths:
- 'changelog-generator/**'
- '.github/workflows/changelog-generator.yml'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: changelog-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/checksum-phar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ on:
- '.github/workflows/checksum-phar.yml'
push:
branches:
- "1.11.x"
- "1.12.x"
paths:
- 'compiler/**'
- '.github/workflows/checksum-phar.yml'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: checksum-phar-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand All @@ -37,7 +37,7 @@ jobs:
with:
repository: phpstan/phpstan
path: phpstan-dist
ref: 1.11.x
ref: 1.12.x

- name: "Get info"
id: info
Expand Down Expand Up @@ -101,14 +101,14 @@ jobs:
- name: "Composer dump"
run: "composer install --no-interaction --no-progress"
env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

- name: "Compile PHAR for checksum"
working-directory: "compiler/build"
run: "php box.phar compile --no-parallel"
env:
PHAR_CHECKSUM: "1"
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

- name: "Re-sign PHAR"
run: "php compiler/build/resign.php tmp/phpstan.phar"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ on:
- 'issue-bot/**'
push:
branches:
- "1.11.x"
- "1.12.x"
paths-ignore:
- 'compiler/**'
- 'apigen/**'
- 'changelog-generator/**'
- 'issue-bot/**'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: e2e-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
pull_request:
push:
branches:
- "1.11.x"
- "1.12.x"

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/phar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
pull_request:
push:
branches:
- "1.11.x"
- "1.12.x"
tags:
- '1.11.*'
- '1.12.*'

concurrency:
group: phar-${{ github.ref }} # will be canceled on subsequent pushes in both branches and pull requests
Expand Down Expand Up @@ -77,14 +77,14 @@ jobs:
- name: "Composer dump"
run: "composer install --no-interaction --no-progress"
env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

- name: "Compile PHAR for checksum"
working-directory: "compiler/build"
run: "php box.phar compile --no-parallel"
env:
PHAR_CHECKSUM: "1"
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

- name: "Re-sign PHAR"
run: "php compiler/build/resign.php tmp/phpstan.phar"
Expand All @@ -107,30 +107,30 @@ jobs:
integration-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.11.x
uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.12.x
with:
ref: 1.11.x
ref: 1.12.x
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}

extension-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/extension-tests.yml@1.11.x
uses: phpstan/phpstan/.github/workflows/extension-tests.yml@1.12.x
with:
ref: 1.11.x
ref: 1.12.x
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}

other-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/other-tests.yml@1.11.x
uses: phpstan/phpstan/.github/workflows/other-tests.yml@1.12.x
with:
ref: 1.11.x
ref: 1.12.x
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}

commit:
name: "Commit PHAR"
if: "github.repository_owner == 'phpstan' && (github.ref == 'refs/heads/1.11.x' || startsWith(github.ref, 'refs/tags/'))"
if: "github.repository_owner == 'phpstan' && (github.ref == 'refs/heads/1.12.x' || startsWith(github.ref, 'refs/tags/'))"
needs: compiler-tests
runs-on: "ubuntu-latest"
timeout-minutes: 60
Expand All @@ -152,7 +152,7 @@ jobs:
repository: phpstan/phpstan
path: phpstan-dist
token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
ref: 1.11.x
ref: 1.12.x

- name: "Get previous pushed dist commit"
id: previous-commit
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reflection-golden-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ on:
- 'issue-bot/**'
push:
branches:
- "1.11.x"
- "1.12.x"
paths-ignore:
- 'compiler/**'
- 'apigen/**'
- 'changelog-generator/**'
- 'issue-bot/**'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"
REFLECTION_GOLDEN_TEST_FILE: "/tmp/reflection-golden.test"
REFLECTION_GOLDEN_SYMBOLS_FILE: "/tmp/reflection-golden-symbols.txt"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:
push:
branches:
- "1.11.x"
- "1.12.x"

jobs:
typos:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ on:
- 'apigen/**'
push:
branches:
- "1.11.x"
- "1.12.x"
paths-ignore:
- 'compiler/**'
- 'apigen/**'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: sa-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ on:
- 'issue-bot/**'
push:
branches:
- "1.11.x"
- "1.12.x"
paths-ignore:
- 'compiler/**'
- 'apigen/**'
- 'changelog-generator/**'
- 'issue-bot/**'

env:
COMPOSER_ROOT_VERSION: "1.11.x-dev"
COMPOSER_ROOT_VERSION: "1.12.x-dev"

concurrency:
group: tests-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
Expand Down

0 comments on commit c376c8b

Please sign in to comment.