Skip to content

Commit 5252753

Browse files
andy31415andreilitvin
authored andcommitted
Remove gn_bootstrap.sh (#26335)
* Remove gn_bootstra.sh * execute bash for source bootstrap invokations * update chef readme too * Fix cirque quoting * Fix codelints * Undo whitespace changes in certbins * Do not use source to execute bootstrap * Fix dockerfile in chip-cert-bins * Fix cirque --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent 5439cc4 commit 5252753

37 files changed

+50
-76
lines changed

.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
build_overrides/pigweed_environment.gni
7878
- name: Bootstrap
7979
timeout-minutes: 10
80-
run: scripts/build/gn_bootstrap.sh
80+
run: bash scripts/bootstrap.sh
8181
- name: Uploading bootstrap logs
8282
uses: actions/upload-artifact@v3
8383
if: ${{ always() && !env.ACT }}
@@ -194,7 +194,7 @@ jobs:
194194
build_overrides/pigweed_environment.gni
195195
- name: Bootstrap
196196
timeout-minutes: 10
197-
run: scripts/build/gn_bootstrap.sh
197+
run: bash scripts/bootstrap.sh
198198
- name: Uploading bootstrap logs
199199
uses: actions/upload-artifact@v3
200200
if: ${{ always() && !env.ACT }}
@@ -356,7 +356,7 @@ jobs:
356356
build_overrides/pigweed_environment.gni
357357
- name: Bootstrap
358358
timeout-minutes: 10
359-
run: scripts/build/gn_bootstrap.sh
359+
run: bash scripts/bootstrap.sh
360360

361361
- name: Setup Build, Run Build and Run Tests
362362
timeout-minutes: 50
@@ -415,7 +415,7 @@ jobs:
415415
build_overrides/pigweed_environment.gni
416416
- name: Bootstrap
417417
timeout-minutes: 25
418-
run: scripts/build/gn_bootstrap.sh
418+
run: bash scripts/bootstrap.sh
419419
- name: Uploading bootstrap logs
420420
uses: actions/upload-artifact@v3
421421
if: ${{ always() && !env.ACT }}
@@ -515,7 +515,7 @@ jobs:
515515
build_overrides/pigweed_environment.gni
516516
- name: Bootstrap
517517
timeout-minutes: 10
518-
run: scripts/build/gn_bootstrap.sh
518+
run: bash scripts/bootstrap.sh
519519
- name: Uploading bootstrap logs
520520
uses: actions/upload-artifact@v3
521521
if: ${{ always() && !env.ACT }}

.github/workflows/chef.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
build_overrides/pigweed_environment.gni
5555
- name: Bootstrap
5656
timeout-minutes: 10
57-
run: scripts/build/gn_bootstrap.sh
57+
run: bash scripts/bootstrap.sh
5858
- name: CI Examples Linux
5959
shell: bash
6060
run: |
@@ -90,7 +90,7 @@ jobs:
9090
build_overrides/pigweed_environment.gni
9191
- name: Bootstrap
9292
timeout-minutes: 10
93-
run: scripts/build/gn_bootstrap.sh
93+
run: bash scripts/bootstrap.sh
9494
- name: CI Examples ESP32
9595
shell: bash
9696
run: |
@@ -126,7 +126,7 @@ jobs:
126126
build_overrides/pigweed_environment.gni
127127
- name: Bootstrap
128128
timeout-minutes: 10
129-
run: scripts/build/gn_bootstrap.sh
129+
run: bash scripts/bootstrap.sh
130130
- name: CI Examples NRFConnect
131131
shell: bash
132132
run: |

.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
integrations/docker/images/chip-build-cirque/run.sh \
7676
-- sh -c " \
7777
git config --global --add safe.directory '*' \
78-
&& scripts/build/gn_bootstrap.sh \
78+
&& bash scripts/bootstrap.sh \
7979
&& chown -R $(id -u):$(id -g) .environment \
8080
"
8181

.github/workflows/darwin-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
build_overrides/pigweed_environment.gni
7777
- name: Bootstrap
7878
timeout-minutes: 25
79-
run: scripts/build/gn_bootstrap.sh
79+
run: bash scripts/bootstrap.sh
8080
- name: Uploading bootstrap logs
8181
uses: actions/upload-artifact@v3
8282
if: ${{ always() && !env.ACT }}

.github/workflows/darwin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
build_overrides/pigweed_environment.gni
5757
- name: Bootstrap
5858
timeout-minutes: 25
59-
run: scripts/build/gn_bootstrap.sh
59+
run: bash scripts/bootstrap.sh
6060
- name: Uploading bootstrap logs
6161
uses: actions/upload-artifact@v3
6262
if: ${{ always() && !env.ACT }}

.github/workflows/examples-ameba.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
.environment
6060
build_overrides/pigweed_environment.gni
6161
- name: Bootstrap
62-
run: scripts/build/gn_bootstrap.sh
62+
run: bash scripts/bootstrap.sh
6363
- name: Build example Ameba All Clusters App
6464
run: |
6565
./scripts/run_in_build_env.sh \

.github/workflows/examples-bouffalolab.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
build_overrides/pigweed_environment.gni
6868
- name: Bootstrap
6969
timeout-minutes: 25
70-
run: scripts/build/gn_bootstrap.sh
70+
run: bash scripts/bootstrap.sh
7171
- name: Uploading bootstrap logs
7272
uses: actions/upload-artifact@v3
7373
if: ${{ always() && !env.ACT }}

.github/workflows/examples-cc13x2x7_26x2x7.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
build_overrides/pigweed_environment.gni
6969
- name: Bootstrap
7070
timeout-minutes: 25
71-
run: scripts/build/gn_bootstrap.sh
71+
run: bash scripts/bootstrap.sh
7272
- name: Uploading bootstrap logs
7373
uses: actions/upload-artifact@v3
7474
if: ${{ always() && !env.ACT }}

.github/workflows/examples-cc32xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
build_overrides/pigweed_environment.gni
6666
- name: Bootstrap
6767
timeout-minutes: 25
68-
run: scripts/build/gn_bootstrap.sh
68+
run: bash scripts/bootstrap.sh
6969
- name: Uploading bootstrap logs
7070
uses: actions/upload-artifact@v3
7171
if: ${{ always() && !env.ACT }}

.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
build_overrides/pigweed_environment.gni
7474
- name: Bootstrap
7575
timeout-minutes: 25
76-
run: scripts/build/gn_bootstrap.sh
76+
run: bash scripts/bootstrap.sh
7777
- name: Uploading bootstrap logs
7878
uses: actions/upload-artifact@v3
7979
if: ${{ always() && !env.ACT }}

.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
build_overrides/pigweed_environment.gni
6868
- name: Bootstrap
6969
timeout-minutes: 10
70-
run: scripts/build/gn_bootstrap.sh
70+
run: bash scripts/bootstrap.sh
7171
- name: Uploading bootstrap logs
7272
uses: actions/upload-artifact@v3
7373
if: ${{ always() && !env.ACT }}
@@ -186,7 +186,7 @@ jobs:
186186
build_overrides/pigweed_environment.gni
187187
- name: Bootstrap
188188
timeout-minutes: 10
189-
run: scripts/build/gn_bootstrap.sh
189+
run: bash scripts/bootstrap.sh
190190
- name: Uploading bootstrap logs
191191
uses: actions/upload-artifact@v3
192192
if: ${{ always() && !env.ACT }}

.github/workflows/examples-infineon.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
build_overrides/pigweed_environment.gni
6868
- name: Bootstrap
6969
timeout-minutes: 25
70-
run: scripts/build/gn_bootstrap.sh
70+
run: bash scripts/bootstrap.sh
7171
- name: Uploading bootstrap logs
7272
uses: actions/upload-artifact@v3
7373
if: ${{ always() && !env.ACT }}

.github/workflows/examples-k32w.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
build_overrides/pigweed_environment.gni
7070
- name: Bootstrap
7171
timeout-minutes: 25
72-
run: scripts/build/gn_bootstrap.sh
72+
run: bash scripts/bootstrap.sh
7373
- name: Uploading bootstrap logs
7474
uses: actions/upload-artifact@v3
7575
if: ${{ always() && !env.ACT }}

.github/workflows/examples-linux-arm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
build_overrides/pigweed_environment.gni
6868
- name: Bootstrap
6969
timeout-minutes: 10
70-
run: scripts/build/gn_bootstrap.sh
70+
run: bash scripts/bootstrap.sh
7171
- name: Uploading bootstrap logs
7272
uses: actions/upload-artifact@v3
7373
if: ${{ always() && !env.ACT }}

.github/workflows/examples-linux-imx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
.environment
5959
build_overrides/pigweed_environment.gni
6060
- name: Bootstrap
61-
run: scripts/build/gn_bootstrap.sh
61+
run: bash scripts/bootstrap.sh
6262

6363
- name: Build lighting-app
6464
timeout-minutes: 30

.github/workflows/examples-linux-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
build_overrides/pigweed_environment.gni
6868
- name: Bootstrap
6969
timeout-minutes: 10
70-
run: scripts/build/gn_bootstrap.sh
70+
run: bash scripts/bootstrap.sh
7171
- name: Uploading bootstrap logs
7272
uses: actions/upload-artifact@v3
7373
if: ${{ always() && !env.ACT }}

.github/workflows/examples-mbed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
build_overrides/pigweed_environment.gni
8484
- name: Bootstrap
8585
timeout-minutes: 10
86-
run: scripts/build/gn_bootstrap.sh
86+
run: bash scripts/bootstrap.sh
8787
- name: Uploading bootstrap logs
8888
uses: actions/upload-artifact@v3
8989
if: ${{ always() && !env.ACT }}

.github/workflows/examples-mw320.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
build_overrides/pigweed_environment.gni
7070
- name: Bootstrap
7171
timeout-minutes: 25
72-
run: scripts/build/gn_bootstrap.sh
72+
run: bash scripts/bootstrap.sh
7373
- name: Uploading bootstrap logs
7474
uses: actions/upload-artifact@v3
7575
if: ${{ always() && !env.ACT }}

.github/workflows/examples-nrfconnect.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
build_overrides/pigweed_environment.gni
8585
- name: Bootstrap
8686
timeout-minutes: 25
87-
run: scripts/build/gn_bootstrap.sh
87+
run: bash scripts/bootstrap.sh
8888
- name: Uploading bootstrap logs
8989
uses: actions/upload-artifact@v3
9090
if: ${{ always() && !env.ACT }}

.github/workflows/examples-openiotsdk.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
build_overrides/pigweed_environment.gni
7070
- name: Bootstrap
7171
timeout-minutes: 10
72-
run: scripts/build/gn_bootstrap.sh
72+
run: bash scripts/bootstrap.sh
7373

7474
- name: Build and install Python controller
7575
timeout-minutes: 10

.github/workflows/examples-qpg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
build_overrides/pigweed_environment.gni
7070
- name: Bootstrap
7171
timeout-minutes: 25
72-
run: scripts/build/gn_bootstrap.sh
72+
run: bash scripts/bootstrap.sh
7373
- name: Uploading bootstrap logs
7474
uses: actions/upload-artifact@v3
7575
if: ${{ always() && !env.ACT }}

.github/workflows/examples-telink.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
build_overrides/pigweed_environment.gni
6969
- name: Bootstrap
7070
timeout-minutes: 25
71-
run: scripts/build/gn_bootstrap.sh
71+
run: bash scripts/bootstrap.sh
7272

7373
- name: Build example Telink All Clusters App
7474
run: |

.github/workflows/examples-tizen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
.environment
6262
build_overrides/pigweed_environment.gni
6363
- name: Bootstrap
64-
run: scripts/build/gn_bootstrap.sh
64+
run: bash scripts/bootstrap.sh
6565

6666
- name: Build Tizen examples
6767
run: |

.github/workflows/full-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
build_overrides/pigweed_environment.gni
7474
- name: Bootstrap
7575
timeout-minutes: 10
76-
run: scripts/build/gn_bootstrap.sh
76+
run: bash scripts/bootstrap.sh
7777
- name: Uploading bootstrap logs
7878
uses: actions/upload-artifact@v3
7979
if: ${{ always() && !env.ACT }}

.github/workflows/fuzzing-build.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
build_overrides/pigweed_environment.gni
6565
- name: Bootstrap
6666
timeout-minutes: 10
67-
run: scripts/build/gn_bootstrap.sh
67+
run: bash scripts/bootstrap.sh
6868
- name: Uploading bootstrap logs
6969
uses: actions/upload-artifact@v3
7070
if: ${{ always() && !env.ACT }}
@@ -124,7 +124,7 @@ jobs:
124124
build_overrides/pigweed_environment.gni
125125
- name: Bootstrap
126126
timeout-minutes: 25
127-
run: scripts/build/gn_bootstrap.sh
127+
run: bash scripts/bootstrap.sh
128128
- name: Uploading bootstrap logs
129129
uses: actions/upload-artifact@v3
130130
if: ${{ always() && !env.ACT }}

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
build_overrides/pigweed_environment.gni
6666
- name: Bootstrap
6767
timeout-minutes: 10
68-
run: scripts/build/gn_bootstrap.sh
68+
run: bash scripts/bootstrap.sh
6969

7070
- name: Check for matter lint errors
7171
if: always()

.github/workflows/qemu.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
build_overrides/pigweed_environment.gni
6666
- name: Bootstrap
6767
timeout-minutes: 25
68-
run: scripts/build/gn_bootstrap.sh
68+
run: bash scripts/bootstrap.sh
6969
- name: Uploading bootstrap logs
7070
uses: actions/upload-artifact@v3
7171
if: ${{ always() && !env.ACT }}
@@ -129,7 +129,7 @@ jobs:
129129
build_overrides/pigweed_environment.gni
130130
- name: Bootstrap
131131
timeout-minutes: 25
132-
run: scripts/build/gn_bootstrap.sh
132+
run: bash scripts/bootstrap.sh
133133

134134
- name: Build and run tests
135135
run: |

.github/workflows/release_artifacts.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
build_overrides/pigweed_environment.gni
5454
- name: Bootstrap
5555
timeout-minutes: 25
56-
run: scripts/build/gn_bootstrap.sh
56+
run: bash scripts/bootstrap.sh
5757
- name: Uploading bootstrap logs
5858
uses: actions/upload-artifact@v3
5959
if: ${{ always() && !env.ACT }}
@@ -108,7 +108,7 @@ jobs:
108108
build_overrides/pigweed_environment.gni
109109
- name: Bootstrap
110110
timeout-minutes: 25
111-
run: scripts/build/gn_bootstrap.sh
111+
run: bash scripts/bootstrap.sh
112112
- name: Uploading bootstrap logs
113113
uses: actions/upload-artifact@v3
114114
if: ${{ always() && !env.ACT }}

.github/workflows/smoketest-android.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
build_overrides/pigweed_environment.gni
6565
- name: Bootstrap
6666
timeout-minutes: 10
67-
run: scripts/build/gn_bootstrap.sh
67+
run: bash scripts/bootstrap.sh
6868
- name: Uploading bootstrap logs
6969
uses: actions/upload-artifact@v3
7070
if: ${{ always() && !env.ACT }}

.github/workflows/smoketest-darwin.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
build_overrides/pigweed_environment.gni
5757
- name: Bootstrap
5858
timeout-minutes: 25
59-
run: scripts/build/gn_bootstrap.sh
59+
run: bash scripts/bootstrap.sh
6060
- name: Uploading bootstrap logs
6161
uses: actions/upload-artifact@v3
6262
if: ${{ always() && !env.ACT }}

0 commit comments

Comments
 (0)