Skip to content

Commit c6acbe9

Browse files
committed
Fix phar.yml
1 parent 5909dd1 commit c6acbe9

File tree

1 file changed

+3
-25
lines changed

1 file changed

+3
-25
lines changed

.github/workflows/phar.yml

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
tags:
1111
- '2.0.*'
1212

13+
env:
14+
COMPOSER_ROOT_VERSION: "1.12.x-dev"
15+
1316
concurrency:
1417
group: phar-${{ github.ref }} # will be canceled on subsequent pushes in both branches and pull requests
1518
cancel-in-progress: true
@@ -76,15 +79,12 @@ jobs:
7679

7780
- name: "Composer dump"
7881
run: "composer install --no-interaction --no-progress"
79-
env:
80-
COMPOSER_ROOT_VERSION: "1.12.x-dev"
8182

8283
- name: "Compile PHAR for checksum"
8384
working-directory: "compiler/build"
8485
run: "php box.phar compile --no-parallel"
8586
env:
8687
PHAR_CHECKSUM: "1"
87-
COMPOSER_ROOT_VERSION: "1.12.x-dev"
8888

8989
- name: "Re-sign PHAR"
9090
run: "php compiler/build/resign.php tmp/phpstan.phar"
@@ -107,43 +107,25 @@ jobs:
107107
integration-tests:
108108
if: github.event_name == 'pull_request'
109109
needs: compiler-tests
110-
<<<<<<< HEAD
111-
uses: phpstan/phpstan/.github/workflows/[email protected]
112-
with:
113-
ref: 1.12.x
114-
=======
115110
uses: phpstan/phpstan/.github/workflows/[email protected]
116111
with:
117112
ref: 2.0.x
118-
>>>>>>> 264ce7a58b (Open 2.0.x-dev)
119113
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
120114

121115
extension-tests:
122116
if: github.event_name == 'pull_request'
123117
needs: compiler-tests
124-
<<<<<<< HEAD
125-
uses: phpstan/phpstan/.github/workflows/[email protected]
126-
with:
127-
ref: 1.12.x
128-
=======
129118
uses: phpstan/phpstan/.github/workflows/[email protected]
130119
with:
131120
ref: 2.0.x
132-
>>>>>>> 264ce7a58b (Open 2.0.x-dev)
133121
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
134122

135123
other-tests:
136124
if: github.event_name == 'pull_request'
137125
needs: compiler-tests
138-
<<<<<<< HEAD
139-
uses: phpstan/phpstan/.github/workflows/[email protected]
140-
with:
141-
ref: 1.12.x
142-
=======
143126
uses: phpstan/phpstan/.github/workflows/[email protected]
144127
with:
145128
ref: 2.0.x
146-
>>>>>>> 264ce7a58b (Open 2.0.x-dev)
147129
phar-checksum: ${{needs.compiler-tests.outputs.checksum}}
148130

149131
commit:
@@ -170,11 +152,7 @@ jobs:
170152
repository: phpstan/phpstan
171153
path: phpstan-dist
172154
token: ${{ secrets.PHPSTAN_BOT_TOKEN }}
173-
<<<<<<< HEAD
174-
ref: 1.12.x
175-
=======
176155
ref: 2.0.x
177-
>>>>>>> 264ce7a58b (Open 2.0.x-dev)
178156

179157
- name: "Get previous pushed dist commit"
180158
id: previous-commit

0 commit comments

Comments
 (0)