From 7fad5ecd783da0c9012c954777d1238435e7d206 Mon Sep 17 00:00:00 2001
From: Austin Bozowski <bozowski@google.com>
Date: Tue, 24 May 2022 22:33:38 +0000
Subject: [PATCH] Test impact of bootstrap

---
 .github/workflows/chef.yaml | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
index a76e6228f6e7b5..d06510c4533d0c 100644
--- a/.github/workflows/chef.yaml
+++ b/.github/workflows/chef.yaml
@@ -25,7 +25,7 @@ concurrency:
 jobs:
 
     validate_zzz:
-        name: Chef - Validate cached ZAP files
+        name: Chef - Validate cached ZAP output
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
         container:
@@ -47,7 +47,7 @@ jobs:
                 python3 chef.py --validate_zzz
 
     chef_linux:
-        name: Chef Linux lighting-app
+        name: Chef - Linux CI Examples
         needs: validate_zzz
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -65,18 +65,13 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
-            - name: bootstrap
-              shell: bash
-              run: source scripts/bootstrap.sh
             - name: lighting-app Linux
               shell: bash
               run: |
-                source ./scripts/activate.sh
-                cd examples/chef
-                ./chef.py -br --use_zzz -d lighting-app -t linux
+                ./scripts/run_in_build_env.sh "cd examples/chef; ./chef.py -br --use_zzz -d lighting-app -t linux;"
 
     chef_esp32:
-        name: Chef ESP32 lighting-app
+        name: Chef - ESP32 CI Examples
         needs: validate_zzz
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -94,18 +89,13 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
-            - name: bootstrap
-              shell: bash
-              run: source scripts/bootstrap.sh
             - name: lighting-app ESP32
               shell: bash
               run: |
-                source ./scripts/activate.sh
-                cd examples/chef
-                ./chef.py -br --use_zzz -d lighting-app -t esp32
+                ./scripts/run_in_build_env.sh "cd examples/chef; ./chef.py -br --use_zzz -d lighting-app -t esp32;"
 
     chef_nrfconnect:
-        name: Chef NRFConnect lighting-app
+        name: Chef - NRFConnect CI Examples
         needs: validate_zzz
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -123,13 +113,7 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
-            - name: bootstrap
-              shell: bash
-              run: source scripts/bootstrap.sh
             - name: lighting-app NRFConnect
               shell: bash
               run: |
-                source ./scripts/activate.sh
-                cd examples/chef
-                export GNUARMEMB_TOOLCHAIN_PATH="$PW_ARM_CIPD_INSTALL_DIR"
-                ./chef.py -br --use_zzz -d lighting-app -t nrfconnect
+                ./scripts/run_in_build_env.sh "cd examples/chef; export GNUARMEMB_TOOLCHAIN_PATH=\"$PW_ARM_CIPD_INSTALL_DIR\"; ./chef.py -br --use_zzz -d lighting-app -t nrfconnect;