Skip to content

Commit e27f058

Browse files
committed
Removed deployment on PR event and few minor fixes
1 parent 2b9b270 commit e27f058

File tree

4 files changed

+33
-73
lines changed

4 files changed

+33
-73
lines changed

.github/workflows/builder_0_1.yml

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ on:
2929
push:
3030
branches:
3131
- master
32-
paths-ignore:
33-
- '**.md'
3432
pull_request:
3533
branches:
3634
- master
35+
paths-ignore:
36+
- '**.md'
3737
release:
3838
branches:
3939
- master
@@ -82,7 +82,7 @@ jobs:
8282
- name: script
8383
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8484
shell: bash
85-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
85+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
8686
- name: before_script
8787
run: bash patches/curl_stfp_patcher
8888
shell: bash
@@ -92,11 +92,11 @@ jobs:
9292
cp docs/base-gcc.md $HOME/README.md
9393
bash utils/SF_docs_deployer
9494
shell: bash
95-
if: success()
95+
if: success() && github.event_name == 'push'
9696
- name: deploy
9797
run: bash utils/SF_deployer
9898
shell: bash
99-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
99+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
100100
builder-buster_1:
101101
name: Cross GCC-9.2.0 32-bit Buster Pi[0-1]
102102
needs: builder-buster_0
@@ -106,7 +106,7 @@ jobs:
106106
RPIOS_TYPE: buster
107107
RPI_TYPE: 0-1
108108
COMPILER_TYPE: CROSS
109-
steps:
109+
steps:'release' && github.ref
110110
- uses: actions/checkout@v2
111111
- name: before_install
112112
run: |
@@ -142,7 +142,7 @@ jobs:
142142
cp docs/cross-gcc.md $HOME/root/README.md
143143
bash utils/SF_docs_deployer
144144
shell: bash
145-
if: success()
145+
if: success() && github.event_name == 'push'
146146
- name: deploy
147147
run: bash utils/SF_deployer
148148
shell: bash
@@ -168,8 +168,6 @@ jobs:
168168
chmod +x patches/curl_stfp_patcher
169169
dos2unix utils/SF_deployer
170170
chmod +x utils/SF_deployer
171-
dos2unix utils/SF_docs_deployer
172-
chmod +x utils/SF_docs_deployer
173171
if: success()
174172
- name: install
175173
run: |
@@ -235,7 +233,7 @@ jobs:
235233
cp docs/native-gcc.md $HOME/root/README.md
236234
bash utils/SF_docs_deployer
237235
shell: bash
238-
if: success()
236+
if: success() && github.event_name == 'push'
239237
- name: deploy
240238
run: bash utils/SF_deployer
241239
shell: bash
@@ -262,8 +260,6 @@ jobs:
262260
chmod +x patches/curl_stfp_patcher
263261
dos2unix utils/SF_deployer
264262
chmod +x utils/SF_deployer
265-
dos2unix utils/SF_docs_deployer
266-
chmod +x utils/SF_docs_deployer
267263
if: success()
268264
- name: install
269265
run: |
@@ -275,15 +271,15 @@ jobs:
275271
- name: script
276272
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
277273
shell: bash
278-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
274+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
279275
- name: before_script
280276
run: bash patches/curl_stfp_patcher
281277
shell: bash
282278
if: success()
283279
- name: deploy
284280
run: bash utils/SF_deployer
285281
shell: bash
286-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
282+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
287283
builder-stretch_1:
288284
name: Cross GCC-9.2.0 32-bit Stretch Pi[0-1]
289285
needs: builder-stretch_0
@@ -305,8 +301,6 @@ jobs:
305301
chmod +x patches/curl_stfp_patcher
306302
dos2unix utils/SF_deployer
307303
chmod +x utils/SF_deployer
308-
dos2unix utils/SF_docs_deployer
309-
chmod +x utils/SF_docs_deployer
310304
if: success()
311305
- name: install
312306
run: |
@@ -348,8 +342,6 @@ jobs:
348342
chmod +x patches/curl_stfp_patcher
349343
dos2unix utils/SF_deployer
350344
chmod +x utils/SF_deployer
351-
dos2unix utils/SF_docs_deployer
352-
chmod +x utils/SF_docs_deployer
353345
if: success()
354346
- name: install
355347
run: |
@@ -391,8 +383,6 @@ jobs:
391383
chmod +x patches/curl_stfp_patcher
392384
dos2unix utils/SF_deployer
393385
chmod +x utils/SF_deployer
394-
dos2unix utils/SF_docs_deployer
395-
chmod +x utils/SF_docs_deployer
396386
if: success()
397387
- name: install
398388
run: |

.github/workflows/builder_2_3.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ on:
2929
push:
3030
branches:
3131
- master
32-
paths-ignore:
33-
- '**.md'
3432
pull_request:
3533
branches:
3634
- master
35+
paths-ignore:
36+
- '**.md'
3737
release:
3838
branches:
3939
- master
@@ -68,8 +68,6 @@ jobs:
6868
chmod +x patches/curl_stfp_patcher
6969
dos2unix utils/SF_deployer
7070
chmod +x utils/SF_deployer
71-
dos2unix utils/SF_docs_deployer
72-
chmod +x utils/SF_docs_deployer
7371
if: success()
7472
- name: install
7573
run: |
@@ -81,15 +79,15 @@ jobs:
8179
- name: script
8280
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8381
shell: bash
84-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
82+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
8583
- name: before_script
8684
run: bash patches/curl_stfp_patcher
8785
shell: bash
8886
if: success()
8987
- name: deploy
9088
run: bash utils/SF_deployer
9189
shell: bash
92-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
90+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
9391
builder-buster_1:
9492
name: Cross GCC-9.2.0 32-bit Buster Pi[2-3]
9593
needs: builder-buster_0
@@ -134,7 +132,7 @@ jobs:
134132
cp docs/cross-gcc-buster.md $HOME/README.md
135133
bash utils/SF_docs_deployer
136134
shell: bash
137-
if: success()
135+
if: success() && github.event_name == 'push'
138136
- name: deploy
139137
run: bash utils/SF_deployer
140138
shell: bash
@@ -160,8 +158,6 @@ jobs:
160158
chmod +x patches/curl_stfp_patcher
161159
dos2unix utils/SF_deployer
162160
chmod +x utils/SF_deployer
163-
dos2unix utils/SF_docs_deployer
164-
chmod +x utils/SF_docs_deployer
165161
if: success()
166162
- name: install
167163
run: |
@@ -203,8 +199,6 @@ jobs:
203199
chmod +x patches/curl_stfp_patcher
204200
dos2unix utils/SF_deployer
205201
chmod +x utils/SF_deployer
206-
dos2unix utils/SF_docs_deployer
207-
chmod +x utils/SF_docs_deployer
208202
if: success()
209203
- name: install
210204
run: |
@@ -247,8 +241,6 @@ jobs:
247241
chmod +x patches/curl_stfp_patcher
248242
dos2unix utils/SF_deployer
249243
chmod +x utils/SF_deployer
250-
dos2unix utils/SF_docs_deployer
251-
chmod +x utils/SF_docs_deployer
252244
if: success()
253245
- name: install
254246
run: |
@@ -260,15 +252,15 @@ jobs:
260252
- name: script
261253
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
262254
shell: bash
263-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
255+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
264256
- name: before_script
265257
run: bash patches/curl_stfp_patcher
266258
shell: bash
267259
if: success()
268260
- name: deploy
269261
run: bash utils/SF_deployer
270262
shell: bash
271-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
263+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
272264
builder-stretch_1:
273265
name: Cross GCC-9.2.0 32-bit Stretch Pi[2-3]
274266
needs: builder-stretch_0
@@ -313,7 +305,7 @@ jobs:
313305
cp docs/cross-gcc-stretch.md $HOME/README.md
314306
bash utils/SF_docs_deployer
315307
shell: bash
316-
if: success()
308+
if: success() && github.event_name == 'push'
317309
- name: deploy
318310
run: bash utils/SF_deployer
319311
shell: bash
@@ -339,8 +331,6 @@ jobs:
339331
chmod +x patches/curl_stfp_patcher
340332
dos2unix utils/SF_deployer
341333
chmod +x utils/SF_deployer
342-
dos2unix utils/SF_docs_deployer
343-
chmod +x utils/SF_docs_deployer
344334
if: success()
345335
- name: install
346336
run: |
@@ -382,8 +372,6 @@ jobs:
382372
chmod +x patches/curl_stfp_patcher
383373
dos2unix utils/SF_deployer
384374
chmod +x utils/SF_deployer
385-
dos2unix utils/SF_docs_deployer
386-
chmod +x utils/SF_docs_deployer
387375
if: success()
388376
- name: install
389377
run: |

.github/workflows/builder_3_plus.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ on:
2929
push:
3030
branches:
3131
- master
32-
paths-ignore:
33-
- '**.md'
3432
pull_request:
3533
branches:
3634
- master
35+
paths-ignore:
36+
- '**.md'
3737
release:
3838
branches:
3939
- master
@@ -67,8 +67,6 @@ jobs:
6767
chmod +x patches/curl_stfp_patcher
6868
dos2unix utils/SF_deployer
6969
chmod +x utils/SF_deployer
70-
dos2unix utils/SF_docs_deployer
71-
chmod +x utils/SF_docs_deployer
7270
if: success()
7371
- name: install
7472
run: |
@@ -80,15 +78,15 @@ jobs:
8078
- name: script
8179
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
8280
shell: bash
83-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
81+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
8482
- name: before_script
8583
run: bash patches/curl_stfp_patcher
8684
shell: bash
8785
if: success()
8886
- name: deploy
8987
run: bash utils/SF_deployer
9088
shell: bash
91-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
89+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
9290
builder-buster_1:
9391
name: Cross GCC-9.2.0 32-bit Buster Pi[3+]
9492
needs: builder-buster_0
@@ -110,8 +108,6 @@ jobs:
110108
chmod +x patches/curl_stfp_patcher
111109
dos2unix utils/SF_deployer
112110
chmod +x utils/SF_deployer
113-
dos2unix utils/SF_docs_deployer
114-
chmod +x utils/SF_docs_deployer
115111
if: success()
116112
- name: install
117113
run: |
@@ -153,8 +149,6 @@ jobs:
153149
chmod +x patches/curl_stfp_patcher
154150
dos2unix utils/SF_deployer
155151
chmod +x utils/SF_deployer
156-
dos2unix utils/SF_docs_deployer
157-
chmod +x utils/SF_docs_deployer
158152
if: success()
159153
- name: install
160154
run: |
@@ -219,7 +213,7 @@ jobs:
219213
cp docs/native-gcc-buster.md $HOME/README.md
220214
bash utils/SF_docs_deployer
221215
shell: bash
222-
if: success()
216+
if: success() && github.event_name == 'push'
223217
- name: deploy
224218
run: bash utils/SF_deployer
225219
shell: bash
@@ -246,8 +240,6 @@ jobs:
246240
chmod +x patches/curl_stfp_patcher
247241
dos2unix utils/SF_deployer
248242
chmod +x utils/SF_deployer
249-
dos2unix utils/SF_docs_deployer
250-
chmod +x utils/SF_docs_deployer
251243
if: success()
252244
- name: install
253245
run: |
@@ -259,15 +251,15 @@ jobs:
259251
- name: script
260252
run: bash build-scripts/CI/CIBB_32b -g $GCC_VERSION -r $RPI_TYPE -o $RPIOS_TYPE
261253
shell: bash
262-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
254+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
263255
- name: before_script
264256
run: bash patches/curl_stfp_patcher
265257
shell: bash
266258
if: success()
267259
- name: deploy
268260
run: bash utils/SF_deployer
269261
shell: bash
270-
if: success() && github.event_name == 'pull_request' && github.head_ref == 'base'
262+
if: success() && github.event_name == 'release' && github.ref == 'BASE'
271263
builder-stretch_1:
272264
name: Cross GCC-9.2.0 32-bit Stretch Pi[3+]
273265
needs: builder-stretch_0
@@ -289,8 +281,6 @@ jobs:
289281
chmod +x patches/curl_stfp_patcher
290282
dos2unix utils/SF_deployer
291283
chmod +x utils/SF_deployer
292-
dos2unix utils/SF_docs_deployer
293-
chmod +x utils/SF_docs_deployer
294284
if: success()
295285
- name: install
296286
run: |
@@ -332,8 +322,6 @@ jobs:
332322
chmod +x patches/curl_stfp_patcher
333323
dos2unix utils/SF_deployer
334324
chmod +x utils/SF_deployer
335-
dos2unix utils/SF_docs_deployer
336-
chmod +x utils/SF_docs_deployer
337325
if: success()
338326
- name: install
339327
run: |
@@ -398,7 +386,7 @@ jobs:
398386
cp docs/native-gcc-stretch.md $HOME/README.md
399387
bash utils/SF_docs_deployer
400388
shell: bash
401-
if: success()
389+
if: success() && github.event_name == 'push'
402390
- name: deploy
403391
run: bash utils/SF_deployer
404392
shell: bash

0 commit comments

Comments
 (0)