Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.12.x' into 2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
ondrejmirtes committed Sep 6, 2024
2 parents 111e474 + a65f7f8 commit 5c3871b
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 32 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/backward-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ on:
- 'src/**'
- '.github/workflows/backward-compatibility.yml'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: bc-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/build-issue-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ on:
- 'issue-bot/**'
- '.github/workflows/build-issue-bot.yml'

env:
COMPOSER_ROOT_VERSION: "2.0.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
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/changelog-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ on:
- 'changelog-generator/**'
- '.github/workflows/changelog-generator.yml'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: changelog-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/checksum-phar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ on:
- 'compiler/**'
- '.github/workflows/checksum-phar.yml'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: checksum-phar-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ on:
- 'changelog-generator/**'
- 'issue-bot/**'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: e2e-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/issue-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ on:
- 'apigen/**'
- 'changelog-generator/**'

env:
COMPOSER_ROOT_VERSION: "2.0.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
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ on:
branches:
- "2.0.x"

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: lint-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/reflection-golden-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ on:
- 'issue-bot/**'

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

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ on:
- 'compiler/**'
- 'apigen/**'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: sa-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ on:
- 'changelog-generator/**'
- 'issue-bot/**'

env:
COMPOSER_ROOT_VERSION: "2.0.x-dev"

concurrency:
group: tests-${{ github.head_ref || github.run_id }} # will be canceled on subsequent pushes in pull requests but not branches
cancel-in-progress: true
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Any contributions are welcome.
composer install
```

If you encounter dependency problem, try using `export COMPOSER_ROOT_VERSION=1.11.x-dev`

If you are using macOS and are using an older version of `patch`, you may have problems with patch application failure during `composer install`. Try using `brew install gpatch` to install a newer and supported `patch` version.

### Building
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"symfony/string": "^5.4.3"
},
"replace": {
"phpstan/phpstan": "self.version",
"phpstan/phpstan": "2.0.x",
"symfony/polyfill-php73": "*"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5c3871b

Please sign in to comment.