Skip to content

Commit 19c634f

Browse files
authored
Build the 4x branch like it's master (#7780)
1 parent 40cb043 commit 19c634f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/build.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build
33
on:
44
push:
55
branches:
6-
- okhttp_4.10.x
6+
- okhttp_4x
77
pull_request:
88
types: [opened, labeled, unlabeled, synchronize]
99

@@ -13,7 +13,7 @@ env:
1313
jobs:
1414
publish:
1515
runs-on: ubuntu-latest
16-
if: github.ref == 'refs/heads/master'
16+
if: github.ref == 'refs/heads/okhttp_4x'
1717

1818
steps:
1919
- name: Checkout
@@ -74,7 +74,7 @@ jobs:
7474

7575
testzulu11:
7676
runs-on: ubuntu-latest
77-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'zulu')
77+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'zulu')
7878

7979
steps:
8080
- name: Checkout
@@ -94,7 +94,7 @@ jobs:
9494

9595
testopenjdk8:
9696
runs-on: ubuntu-latest
97-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdk8')
97+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'jdk8')
9898

9999
steps:
100100
- name: Checkout
@@ -114,7 +114,7 @@ jobs:
114114

115115
testopenjdk8alpn:
116116
runs-on: ubuntu-latest
117-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'jdk8')
117+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'jdk8')
118118

119119
steps:
120120
- name: Checkout
@@ -140,7 +140,7 @@ jobs:
140140

141141
testopenjsse:
142142
runs-on: ubuntu-latest
143-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'openjsse')
143+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'openjsse')
144144

145145
steps:
146146
- name: Checkout
@@ -160,7 +160,7 @@ jobs:
160160

161161
testconscrypt:
162162
runs-on: ubuntu-latest
163-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'conscrypt')
163+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'conscrypt')
164164

165165
steps:
166166
- name: Checkout
@@ -180,7 +180,7 @@ jobs:
180180

181181
testbouncycastle:
182182
runs-on: ubuntu-latest
183-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'bouncycastle')
183+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'bouncycastle')
184184

185185
steps:
186186
- name: Checkout
@@ -200,7 +200,7 @@ jobs:
200200

201201
testcorretto:
202202
runs-on: ubuntu-latest
203-
if: github.ref == 'refs/heads/master'
203+
if: github.ref == 'refs/heads/okhttp_4x'
204204

205205
steps:
206206
- name: Checkout
@@ -220,7 +220,7 @@ jobs:
220220

221221
testopenjdk16:
222222
runs-on: ubuntu-latest
223-
if: github.ref == 'refs/heads/master'
223+
if: github.ref == 'refs/heads/okhttp_4x'
224224

225225
steps:
226226
- name: Checkout
@@ -240,7 +240,7 @@ jobs:
240240

241241
testwindows:
242242
runs-on: windows-latest
243-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'windows')
243+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'windows')
244244

245245
steps:
246246
- name: Checkout
@@ -261,7 +261,7 @@ jobs:
261261
262262
testgraal:
263263
runs-on: ubuntu-latest
264-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'graal')
264+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'graal')
265265

266266
steps:
267267
- name: Checkout
@@ -284,7 +284,7 @@ jobs:
284284

285285
testandroid:
286286
runs-on: macos-latest
287-
if: github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'android')
287+
if: github.ref == 'refs/heads/okhttp_4x' || contains(github.event.pull_request.labels.*.name, 'android')
288288

289289
strategy:
290290
fail-fast: false

0 commit comments

Comments
 (0)