From 403480d1f34fba8f490bae3a1d78c681a9d0bc37 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 5 May 2023 14:04:43 -0400 Subject: [PATCH] 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 --- .github/workflows/build.yaml | 10 +++---- .github/workflows/chef.yaml | 6 ++--- .github/workflows/cirque.yaml | 2 +- .github/workflows/darwin-tests.yaml | 2 +- .github/workflows/darwin.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .github/workflows/examples-bouffalolab.yaml | 2 +- .../workflows/examples-cc13x2x7_26x2x7.yaml | 2 +- .github/workflows/examples-cc32xx.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 +-- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .github/workflows/examples-linux-imx.yaml | 2 +- .../workflows/examples-linux-standalone.yaml | 2 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-openiotsdk.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 4 +-- .github/workflows/lint.yml | 2 +- .github/workflows/qemu.yaml | 4 +-- .github/workflows/release_artifacts.yaml | 4 +-- .github/workflows/smoketest-android.yaml | 2 +- .github/workflows/smoketest-darwin.yaml | 2 +- .github/workflows/tests.yaml | 10 +++---- .github/workflows/unit_integration_test.yaml | 2 +- .github/workflows/zap_regeneration.yaml | 2 +- .github/workflows/zap_templates.yaml | 2 +- examples/chef/README.md | 2 +- .../docker/images/chip-cert-bins/Dockerfile | 2 +- scripts/build/gn_bootstrap.sh | 26 ------------------- 37 files changed, 50 insertions(+), 76 deletions(-) delete mode 100755 scripts/build/gn_bootstrap.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 3db04035806804..7b3ef0fa68bbf2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -77,7 +77,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -194,7 +194,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -356,7 +356,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Setup Build, Run Build and Run Tests timeout-minutes: 50 @@ -415,7 +415,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -515,7 +515,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 1581ab30078ba0..ccad5e54903d51 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -54,7 +54,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: CI Examples Linux shell: bash run: | @@ -90,7 +90,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: CI Examples ESP32 shell: bash run: | @@ -126,7 +126,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: CI Examples NRFConnect shell: bash run: | diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 3ba684577149de..ba63170544e724 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -75,7 +75,7 @@ jobs: integrations/docker/images/chip-build-cirque/run.sh \ -- sh -c " \ git config --global --add safe.directory '*' \ - && scripts/build/gn_bootstrap.sh \ + && bash scripts/bootstrap.sh \ && chown -R $(id -u):$(id -g) .environment \ " diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml index 5e4d26d27e41c3..face48a25e88e0 100644 --- a/.github/workflows/darwin-tests.yaml +++ b/.github/workflows/darwin-tests.yaml @@ -76,7 +76,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index 2a7c3642919323..169606644a9e19 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -56,7 +56,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index b902a3815838c1..edfbeab2211cdb 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -59,7 +59,7 @@ jobs: .environment build_overrides/pigweed_environment.gni - name: Bootstrap - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Build example Ameba All Clusters App run: | ./scripts/run_in_build_env.sh \ diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml index e7fbe4a8a13856..f16e063e699414 100644 --- a/.github/workflows/examples-bouffalolab.yaml +++ b/.github/workflows/examples-bouffalolab.yaml @@ -67,7 +67,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index 2e0bee2f65cd3a..1011e900e30729 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -68,7 +68,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-cc32xx.yaml b/.github/workflows/examples-cc32xx.yaml index 4ebc1114cfc35d..e542294194dbc7 100644 --- a/.github/workflows/examples-cc32xx.yaml +++ b/.github/workflows/examples-cc32xx.yaml @@ -65,7 +65,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index ce2163d1581b18..5974ce33ab5f3d 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -73,7 +73,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 42cf0bdf72839c..afaa375cc501c5 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -67,7 +67,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -186,7 +186,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index 262f2fcc7cd42f..42678cd5e64589 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -67,7 +67,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index a9c405d010fd4a..047d6cd68d2a50 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -69,7 +69,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index 0d949bdc748b97..0eb21a41ec0778 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -67,7 +67,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml index 1c6220bdca5fb7..9530b4ca343053 100644 --- a/.github/workflows/examples-linux-imx.yaml +++ b/.github/workflows/examples-linux-imx.yaml @@ -58,7 +58,7 @@ jobs: .environment build_overrides/pigweed_environment.gni - name: Bootstrap - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Build lighting-app timeout-minutes: 30 diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index f2931055be403e..2664f9f9896b09 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -67,7 +67,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index dadbb5eff3d476..55ad878b91fecd 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -83,7 +83,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index 36f7c9cdb26c2e..f980b3249f9168 100755 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -69,7 +69,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index 2c4a318ee6ed9a..09ec03dd1896da 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -84,7 +84,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml index 2e3af4d79473ef..a4d873a5e813c9 100644 --- a/.github/workflows/examples-openiotsdk.yaml +++ b/.github/workflows/examples-openiotsdk.yaml @@ -69,7 +69,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Build and install Python controller timeout-minutes: 10 diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index 3320d618d07798..cfa56c20acddec 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -69,7 +69,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index 2ebd9923551732..103538b8a35cad 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -68,7 +68,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Build example Telink All Clusters App run: | diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index 2946170d872793..ab6ffb2dfb8b5d 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -61,7 +61,7 @@ jobs: .environment build_overrides/pigweed_environment.gni - name: Bootstrap - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Build Tizen examples run: | diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 76bc42944c7fcc..d57b493097e984 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -73,7 +73,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 82aa03af5cef67..801a1cf20a71a8 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -64,7 +64,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -124,7 +124,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6813f7d61fa964..85af069b51d8f6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -65,7 +65,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Check for matter lint errors if: always() diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 3883512f0d729b..cf2bcad747d673 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -65,7 +65,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -129,7 +129,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Build and run tests run: | diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index f725931e760da5..b9bbd6376a701d 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -53,7 +53,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -108,7 +108,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index ba1124b23af05a..d9b723645c564c 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -64,7 +64,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/smoketest-darwin.yaml b/.github/workflows/smoketest-darwin.yaml index abf9ce606e8402..7cefedeca044b0 100644 --- a/.github/workflows/smoketest-darwin.yaml +++ b/.github/workflows/smoketest-darwin.yaml @@ -56,7 +56,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index f52c3ccf8f1d7d..69d83a5e00748e 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -90,7 +90,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -346,7 +346,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -468,7 +468,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -555,7 +555,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} @@ -728,7 +728,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index 7623e8082c97cd..a797c4116370ee 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -58,7 +58,7 @@ jobs: timeout-minutes: 10 run: | mkdir -p /tmp/log_output ; - scripts/build/gn_bootstrap.sh ; + bash scripts/bootstrap.sh ; - name: Uploading bootstrap logs uses: actions/upload-artifact@v3 if: ${{ always() && !env.ACT }} diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 406e546a6b4a96..1057e83af455ba 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -57,7 +57,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Generate all timeout-minutes: 5 diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index 9e0febe3f817c0..5b0ba11fa6ca69 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -58,7 +58,7 @@ jobs: build_overrides/pigweed_environment.gni - name: Bootstrap timeout-minutes: 10 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: Generate all run: ./scripts/run_in_build_env.sh scripts/tools/zap_regen_all.py diff --git a/examples/chef/README.md b/examples/chef/README.md index f03b46e01d7ea4..da87ca307f847f 100644 --- a/examples/chef/README.md +++ b/examples/chef/README.md @@ -150,7 +150,7 @@ chef_$PLATFORM: scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform $PLATFORM - name: Bootstrap timeout-minutes: 25 - run: scripts/build/gn_bootstrap.sh + run: bash scripts/bootstrap.sh - name: CI Examples $PLATFORM shell: bash run: | diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index a1a7f73d11aa95..d1d4992522daf5 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -201,7 +201,7 @@ RUN git clone https://github.com/project-chip/connectedhomeip.git /root/connecte WORKDIR /root/connectedhomeip/ RUN git checkout ${COMMITHASH} RUN ./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux -RUN scripts/build/gn_bootstrap.sh +RUN bash scripts/bootstrap.sh SHELL ["/bin/bash", "-c"] RUN set -x && \ source scripts/activate.sh \ diff --git a/scripts/build/gn_bootstrap.sh b/scripts/build/gn_bootstrap.sh deleted file mode 100755 index d2390771b78870..00000000000000 --- a/scripts/build/gn_bootstrap.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# -# Copyright (c) 2020 Project CHIP Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set -e - -# Bootstrap script for GN build GitHub workflow. - -# This is used to account bootstrap time in a dedicated workflow step; there's -# no need to use this script locally. - -source "$(dirname "$0")/../../scripts/activate.sh"