10
10
tags :
11
11
- ' 2.0.*'
12
12
13
+ env :
14
+ COMPOSER_ROOT_VERSION : " 1.12.x-dev"
15
+
13
16
concurrency :
14
17
group : phar-${{ github.ref }} # will be canceled on subsequent pushes in both branches and pull requests
15
18
cancel-in-progress : true
@@ -76,15 +79,12 @@ jobs:
76
79
77
80
- name : " Composer dump"
78
81
run : " composer install --no-interaction --no-progress"
79
- env :
80
- COMPOSER_ROOT_VERSION : " 1.12.x-dev"
81
82
82
83
- name : " Compile PHAR for checksum"
83
84
working-directory : " compiler/build"
84
85
run : " php box.phar compile --no-parallel"
85
86
env :
86
87
PHAR_CHECKSUM : " 1"
87
- COMPOSER_ROOT_VERSION : " 1.12.x-dev"
88
88
89
89
- name : " Re-sign PHAR"
90
90
run : " php compiler/build/resign.php tmp/phpstan.phar"
@@ -107,43 +107,25 @@ jobs:
107
107
integration-tests :
108
108
if : github.event_name == 'pull_request'
109
109
needs : compiler-tests
110
- <<<<<<< HEAD
111
- uses :
phpstan/phpstan/.github/workflows/[email protected]
112
- with :
113
- ref : 1.12.x
114
- =======
115
110
uses :
phpstan/phpstan/.github/workflows/[email protected]
116
111
with :
117
112
ref : 2.0.x
118
- >>>>>>> 264ce7a58b (Open 2.0.x-dev)
119
113
phar-checksum : ${{needs.compiler-tests.outputs.checksum}}
120
114
121
115
extension-tests :
122
116
if : github.event_name == 'pull_request'
123
117
needs : compiler-tests
124
- <<<<<<< HEAD
125
- uses :
phpstan/phpstan/.github/workflows/[email protected]
126
- with :
127
- ref : 1.12.x
128
- =======
129
118
uses :
phpstan/phpstan/.github/workflows/[email protected]
130
119
with :
131
120
ref : 2.0.x
132
- >>>>>>> 264ce7a58b (Open 2.0.x-dev)
133
121
phar-checksum : ${{needs.compiler-tests.outputs.checksum}}
134
122
135
123
other-tests :
136
124
if : github.event_name == 'pull_request'
137
125
needs : compiler-tests
138
- <<<<<<< HEAD
139
- uses :
phpstan/phpstan/.github/workflows/[email protected]
140
- with :
141
- ref : 1.12.x
142
- =======
143
126
uses :
phpstan/phpstan/.github/workflows/[email protected]
144
127
with :
145
128
ref : 2.0.x
146
- >>>>>>> 264ce7a58b (Open 2.0.x-dev)
147
129
phar-checksum : ${{needs.compiler-tests.outputs.checksum}}
148
130
149
131
commit :
@@ -170,11 +152,7 @@ jobs:
170
152
repository : phpstan/phpstan
171
153
path : phpstan-dist
172
154
token : ${{ secrets.PHPSTAN_BOT_TOKEN }}
173
- <<<<<<< HEAD
174
- ref : 1.12.x
175
- =======
176
155
ref : 2.0.x
177
- >>>>>>> 264ce7a58b (Open 2.0.x-dev)
178
156
179
157
- name : " Get previous pushed dist commit"
180
158
id : previous-commit
0 commit comments