Skip to content

Commit

Permalink
Open 1.6-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Mar 28, 2022
1 parent 367a316 commit 82716a6
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 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,10 +6,10 @@ on:
pull_request:
push:
branches:
- "1.5.x"
- "1.6.x"

env:
COMPOSER_ROOT_VERSION: "1.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.x-dev"

jobs:
backward-compatibility:
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 @@ -8,12 +8,12 @@ on:
- 'compiler/**'
push:
branches:
- "1.5.x"
- "1.6.x"
paths-ignore:
- 'compiler/**'

env:
COMPOSER_ROOT_VERSION: "1.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.x-dev"

jobs:
result-cache-e2e-tests:
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.5.x"
- "1.6.x"

env:
COMPOSER_ROOT_VERSION: "1.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.x-dev"

jobs:
lint:
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.5.x"
- "1.6.x"
tags:
- '1.5.*'
- '1.6.*'

jobs:
compiler-tests:
Expand Down Expand Up @@ -89,14 +89,14 @@ jobs:
- name: "Composer dump"
run: "composer install --no-interaction --no-progress"
env:
COMPOSER_ROOT_VERSION: "1.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.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.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.x-dev"

- name: "Re-sign PHAR"
run: "php compiler/build/resign.php tmp/phpstan.phar"
Expand All @@ -114,29 +114,29 @@ jobs:
integration-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.5.x
uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.6.x
with:
ref: 1.5.x
ref: 1.6.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.5.x
uses: phpstan/phpstan/.github/workflows/extension-tests.yml@1.6.x
with:
ref: 1.5.x
ref: 1.6.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.5.x
uses: phpstan/phpstan/.github/workflows/other-tests.yml@1.6.x
with:
ref: 1.5.x
ref: 1.6.x
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}

commit:
if: "github.ref == 'refs/heads/1.5.x' || startsWith(github.ref, 'refs/tags/')"
if: "github.ref == 'refs/heads/1.6.x' || startsWith(github.ref, 'refs/tags/')"
needs: compiler-tests
name: "Commit PHAR"
runs-on: "ubuntu-latest"
Expand All @@ -157,7 +157,7 @@ jobs:
repository: phpstan/phpstan
path: phpstan-dist
token: ${{ secrets.PAT }}
ref: 1.5.x
ref: 1.6.x

- name: "Check PHAR checksum"
id: checksum-difference
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 @@ -8,12 +8,12 @@ on:
- 'compiler/**'
push:
branches:
- "1.5.x"
- "1.6.x"
paths-ignore:
- 'compiler/**'

env:
COMPOSER_ROOT_VERSION: "1.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.x-dev"

jobs:
static-analysis:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
- 'compiler/**'
push:
branches:
- "1.5.x"
- "1.6.x"
paths-ignore:
- 'compiler/**'

env:
COMPOSER_ROOT_VERSION: "1.5.x-dev"
COMPOSER_ROOT_VERSION: "1.6.x-dev"

jobs:
tests:
Expand Down

0 comments on commit 82716a6

Please sign in to comment.