Skip to content

Commit 0288688

Browse files
abhiTronixabhiTronix
committed
BugFixes
1 parent 9e20274 commit 0288688

File tree

4 files changed

+37
-45
lines changed

4 files changed

+37
-45
lines changed

‎.github/workflows/builder_0_1.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
RPI_TYPE: 0-1
5858
COMPILER_TYPE: CROSS
5959
BASE: true
60-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
6160
steps:
6261
- uses: actions/checkout@v2
6362
- name: before_install
@@ -83,7 +82,7 @@ jobs:
8382
- name: script
8483
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8584
shell: bash
86-
if: success()
85+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
8786
- name: before_script
8887
run: bash patches/curl_stfp_patcher
8988
shell: bash
@@ -97,7 +96,7 @@ jobs:
9796
- name: deploy
9897
run: bash utils/SF_deployer
9998
shell: bash
100-
if: success()
99+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
101100
builder-buster_1:
102101
name: Cross GCC-9.2.0 32-bit Buster Pi[0-1]
103102
needs: builder-buster_0
@@ -147,7 +146,7 @@ jobs:
147146
- name: deploy
148147
run: bash utils/SF_deployer
149148
shell: bash
150-
if: github.event_name == 'release' && github.event.action == 'published'
149+
if: success() && github.event_name == 'release' && github.event.action == 'published'
151150
builder-buster_1_1:
152151
name: Cross GCC-8.3.0 32-bit Buster Pi[0-1]
153152
needs: builder-buster_0
@@ -190,7 +189,7 @@ jobs:
190189
- name: deploy
191190
run: bash utils/SF_deployer
192191
shell: bash
193-
if: github.event_name == 'release' && github.event.action == 'published'
192+
if: success() && github.event_name == 'release' && github.event.action == 'published'
194193
builder-buster_2:
195194
name: Native GCC-9.2.0 32-bit Buster Pi[0-1]
196195
needs: [builder-buster_0, builder-buster_1]
@@ -240,7 +239,7 @@ jobs:
240239
- name: deploy
241240
run: bash utils/SF_deployer
242241
shell: bash
243-
if: github.event_name == 'release' && github.event.action == 'published'
242+
if: success() && github.event_name == 'release' && github.event.action == 'published'
244243

245244
builder-stretch_0:
246245
name: BASE GCC-6.3.0 32-bit Stretch Pi[0-1]
@@ -251,7 +250,6 @@ jobs:
251250
RPI_TYPE: 0-1
252251
COMPILER_TYPE: CROSS
253252
BASE: true
254-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
255253
steps:
256254
- uses: actions/checkout@v2
257255
- name: before_install
@@ -277,15 +275,15 @@ jobs:
277275
- name: script
278276
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
279277
shell: bash
280-
if: success()
278+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
281279
- name: before_script
282280
run: bash patches/curl_stfp_patcher
283281
shell: bash
284282
if: success()
285283
- name: deploy
286284
run: bash utils/SF_deployer
287285
shell: bash
288-
if: success()
286+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
289287
builder-stretch_1:
290288
name: Cross GCC-9.2.0 32-bit Stretch Pi[0-1]
291289
needs: builder-stretch_0
@@ -328,7 +326,7 @@ jobs:
328326
- name: deploy
329327
run: bash utils/SF_deployer
330328
shell: bash
331-
if: github.event_name == 'release' && github.event.action == 'published'
329+
if: success() && github.event_name == 'release' && github.event.action == 'published'
332330
builder-stretch_1_1:
333331
name: Cross GCC-6.3.0 32-bit Stretch Pi[0-1]
334332
needs: builder-stretch_0
@@ -371,7 +369,7 @@ jobs:
371369
- name: deploy
372370
run: bash utils/SF_deployer
373371
shell: bash
374-
if: github.event_name == 'release' && github.event.action == 'published'
372+
if: success() && github.event_name == 'release' && github.event.action == 'published'
375373
builder-stretch_2:
376374
name: Native GCC-9.2.0 32-bit Stretch Pi[0-1]
377375
needs: [builder-stretch_0, builder-stretch_1]
@@ -414,4 +412,4 @@ jobs:
414412
- name: deploy
415413
run: bash utils/SF_deployer
416414
shell: bash
417-
if: github.event_name == 'release' && github.event.action == 'published'
415+
if: success() && github.event_name == 'release' && github.event.action == 'published'

‎.github/workflows/builder_2_3.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
RPI_TYPE: 2-3
5757
COMPILER_TYPE: CROSS
5858
BASE: true
59-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
6059
steps:
6160
- uses: actions/checkout@v2
6261
- name: before_install
@@ -82,15 +81,15 @@ jobs:
8281
- name: script
8382
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8483
shell: bash
85-
if: success()
84+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
8685
- name: before_script
8786
run: bash patches/curl_stfp_patcher
8887
shell: bash
8988
if: success()
9089
- name: deploy
9190
run: bash utils/SF_deployer
9291
shell: bash
93-
if: success()
92+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
9493
builder-buster_1:
9594
name: Cross GCC-9.2.0 32-bit Buster Pi[2-3]
9695
needs: builder-buster_0
@@ -139,7 +138,7 @@ jobs:
139138
- name: deploy
140139
run: bash utils/SF_deployer
141140
shell: bash
142-
if: github.event_name == 'release' && github.event.action == 'published'
141+
if: success() && github.event_name == 'release' && github.event.action == 'published'
143142
builder-buster_1_1:
144143
name: Cross GCC-8.3.0 32-bit Buster Pi[2-3]
145144
needs: builder-buster_0
@@ -182,7 +181,7 @@ jobs:
182181
- name: deploy
183182
run: bash utils/SF_deployer
184183
shell: bash
185-
if: github.event_name == 'release' && github.event.action == 'published'
184+
if: success() && github.event_name == 'release' && github.event.action == 'published'
186185
builder-buster_2:
187186
name: Native GCC-9.2.0 32-bit Buster Pi[2-3]
188187
needs: [builder-buster_0, builder-buster_1]
@@ -225,7 +224,7 @@ jobs:
225224
- name: deploy
226225
run: bash utils/SF_deployer
227226
shell: bash
228-
if: github.event_name == 'release' && github.event.action == 'published'
227+
if: success() && github.event_name == 'release' && github.event.action == 'published'
229228

230229
builder-stretch_0:
231230
name: BASE GCC-6.3.0 32-bit Stretch Pi[2-3]
@@ -236,7 +235,6 @@ jobs:
236235
RPI_TYPE: 2-3
237236
COMPILER_TYPE: CROSS
238237
BASE: true
239-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
240238
steps:
241239
- uses: actions/checkout@v2
242240
- name: before_install
@@ -262,15 +260,15 @@ jobs:
262260
- name: script
263261
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
264262
shell: bash
265-
if: success()
263+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
266264
- name: before_script
267265
run: bash patches/curl_stfp_patcher
268266
shell: bash
269267
if: success()
270268
- name: deploy
271269
run: bash utils/SF_deployer
272270
shell: bash
273-
if: success()
271+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
274272
builder-stretch_1:
275273
name: Cross GCC-9.2.0 32-bit Stretch Pi[2-3]
276274
needs: builder-stretch_0
@@ -319,7 +317,7 @@ jobs:
319317
- name: deploy
320318
run: bash utils/SF_deployer
321319
shell: bash
322-
if: github.event_name == 'release' && github.event.action == 'published'
320+
if: success() && github.event_name == 'release' && github.event.action == 'published'
323321
builder-stretch_1_1:
324322
name: Cross GCC-6.3.0 32-bit Stretch Pi[2-3]
325323
needs: builder-stretch_0
@@ -362,7 +360,7 @@ jobs:
362360
- name: deploy
363361
run: bash utils/SF_deployer
364362
shell: bash
365-
if: github.event_name == 'release' && github.event.action == 'published'
363+
if: success() && github.event_name == 'release' && github.event.action == 'published'
366364
builder-stretch_2:
367365
name: Native GCC-9.2.0 32-bit Stretch Pi[2-3]
368366
needs: [builder-stretch_0, builder-stretch_1]
@@ -405,4 +403,4 @@ jobs:
405403
- name: deploy
406404
run: bash utils/SF_deployer
407405
shell: bash
408-
if: github.event_name == 'release' && github.event.action == 'published'
406+
if: success() && github.event_name == 'release' && github.event.action == 'published'

‎.github/workflows/builder_3_plus.yml

+10-13
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ on:
3838
branches:
3939
- master
4040

41-
4241
env:
4342
CURL_VERSION: 7.68.0
4443
CCACHE_COMPRESS: 1
@@ -56,7 +55,6 @@ jobs:
5655
RPI_TYPE: 3+
5756
COMPILER_TYPE: CROSS
5857
BASE: true
59-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
6058
steps:
6159
- uses: actions/checkout@v2
6260
- name: before_install
@@ -82,15 +80,15 @@ jobs:
8280
- name: script
8381
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8482
shell: bash
85-
if: success()
83+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
8684
- name: before_script
8785
run: bash patches/curl_stfp_patcher
8886
shell: bash
8987
if: success()
9088
- name: deploy
9189
run: bash utils/SF_deployer
9290
shell: bash
93-
if: success()
91+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
9492
builder-buster_1:
9593
name: Cross GCC-9.2.0 32-bit Buster Pi[3+]
9694
needs: builder-buster_0
@@ -133,7 +131,7 @@ jobs:
133131
- name: deploy
134132
run: bash utils/SF_deployer
135133
shell: bash
136-
if: github.event_name == 'release' && github.event.action == 'published'
134+
if: success() && github.event_name == 'release' && github.event.action == 'published'
137135
builder-buster_1_1:
138136
name: Cross GCC-8.3.0 32-bit Buster Pi[3+]
139137
needs: builder-buster_0
@@ -176,7 +174,7 @@ jobs:
176174
- name: deploy
177175
run: bash utils/SF_deployer
178176
shell: bash
179-
if: github.event_name == 'release' && github.event.action == 'published'
177+
if: success() && github.event_name == 'release' && github.event.action == 'published'
180178
builder-buster_2:
181179
name: Native GCC-9.2.0 32-bit Buster Pi[3+]
182180
needs: [builder-buster_0, builder-buster_1]
@@ -225,7 +223,7 @@ jobs:
225223
- name: deploy
226224
run: bash utils/SF_deployer
227225
shell: bash
228-
if: github.event_name == 'release' && github.event.action == 'published'
226+
if: success() && github.event_name == 'release' && github.event.action == 'published'
229227

230228
builder-stretch_0:
231229
name: BASE GCC-6.3.0 32-bit Stretch Pi[3+]
@@ -236,7 +234,6 @@ jobs:
236234
RPI_TYPE: 3+
237235
COMPILER_TYPE: CROSS
238236
BASE: true
239-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
240237
steps:
241238
- uses: actions/checkout@v2
242239
- name: before_install
@@ -262,15 +259,15 @@ jobs:
262259
- name: script
263260
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
264261
shell: bash
265-
if: success()
262+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
266263
- name: before_script
267264
run: bash patches/curl_stfp_patcher
268265
shell: bash
269266
if: success()
270267
- name: deploy
271268
run: bash utils/SF_deployer
272269
shell: bash
273-
if: success()
270+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
274271
builder-stretch_1:
275272
name: Cross GCC-9.2.0 32-bit Stretch Pi[3+]
276273
needs: builder-stretch_0
@@ -313,7 +310,7 @@ jobs:
313310
- name: deploy
314311
run: bash utils/SF_deployer
315312
shell: bash
316-
if: github.event_name == 'release' && github.event.action == 'published'
313+
if: success() && github.event_name == 'release' && github.event.action == 'published'
317314
builder-stretch_1_1:
318315
name: Cross GCC-6.3.0 32-bit Stretch Pi[3+]
319316
needs: builder-stretch_0
@@ -356,7 +353,7 @@ jobs:
356353
- name: deploy
357354
run: bash utils/SF_deployer
358355
shell: bash
359-
if: github.event_name == 'release' && github.event.action == 'published'
356+
if: success() && github.event_name == 'release' && github.event.action == 'published'
360357
builder-stretch_2:
361358
name: Native GCC-9.2.0 32-bit Stretch Pi[3+]
362359
needs: [builder-stretch_0, builder-stretch_1]
@@ -405,4 +402,4 @@ jobs:
405402
- name: deploy
406403
run: bash utils/SF_deployer
407404
shell: bash
408-
if: github.event_name == 'release' && github.event.action == 'published'
405+
if: success() && github.event_name == 'release' && github.event.action == 'published'

‎.github/workflows/builder_64.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
builder-64_0:
5050
name: BASE GCC-6.3.0 Pi[64]
5151
runs-on: ubuntu-latest
52-
if: github.event_name == 'pull_request' && github.head_ref == 'base'
5352
env:
5453
GCC_VERSION: 6.3.0
5554
RPI_TYPE: 64
@@ -80,7 +79,7 @@ jobs:
8079
- name: script
8180
run: bash build-scripts/CI/CIBB_64b -g $GCC_VERSION
8281
shell: bash
83-
if: success()
82+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
8483
- name: before_script
8584
run: bash patches/curl_stfp_patcher
8685
shell: bash
@@ -95,7 +94,7 @@ jobs:
9594
- name: deploy
9695
run: bash utils/SF_deployer
9796
shell: bash
98-
if: github.event_name == 'release' && github.event.action == 'published'
97+
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
9998
builder-64_1:
10099
name: Cross GCC-9.2.0 Pi[64]
101100
needs: builder-64_0
@@ -143,7 +142,7 @@ jobs:
143142
- name: deploy
144143
run: bash utils/SF_deployer
145144
shell: bash
146-
if: github.event_name == 'release' && github.event.action == 'published'
145+
if: success() && github.event_name == 'release' && github.event.action == 'published'
147146
builder-64_1_0:
148147
name: Cross GCC-6.3.0 Pi[64]
149148
needs: builder-64_0
@@ -185,7 +184,7 @@ jobs:
185184
- name: deploy
186185
run: bash utils/SF_deployer
187186
shell: bash
188-
if: github.event_name == 'release' && github.event.action == 'published'
187+
if: success() && github.event_name == 'release' && github.event.action == 'published'
189188
builder-64_1_1:
190189
name: Cross GCC-8.3.0 Pi[64]
191190
needs: builder-64_0
@@ -227,7 +226,7 @@ jobs:
227226
- name: deploy
228227
run: bash utils/SF_deployer
229228
shell: bash
230-
if: github.event_name == 'release' && github.event.action == 'published'
229+
if: success() && github.event_name == 'release' && github.event.action == 'published'
231230
builder-64_2:
232231
name: Native GCC-9.2.0 Pi[64]
233232
needs: [builder-64_0, builder-64_1]
@@ -275,7 +274,7 @@ jobs:
275274
- name: deploy
276275
run: bash utils/SF_deployer
277276
shell: bash
278-
if: github.event_name == 'release' && github.event.action == 'published'
277+
if: success() && github.event_name == 'release' && github.event.action == 'published'
279278
builder-64_2_1:
280279
name: Native GCC-8.3.0 Pi[64]
281280
needs: [builder-64_0, builder-64_1_1]
@@ -317,4 +316,4 @@ jobs:
317316
- name: deploy
318317
run: bash utils/SF_deployer
319318
shell: bash
320-
if: github.event_name == 'release' && github.event.action == 'published'
319+
if: success() && github.event_name == 'release' && github.event.action == 'published'

0 commit comments

Comments
 (0)