use docker image 0.5.84 (#19937)

* use docker image 0.5.84 * Attempt to fix chef builds by working aroud git fix for CVE-2022-24765 * fix typo * Restyle * Add bootstrap for chef as a separate step * Ensure linux-specific submodules are checked out * Undo change in chef.py ... submodule checkout should already set safe subdirs * Correct the submodule checkout per platform * Keep iMX image to previous version Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Feb 6, 2024 · 3249753 · 3249753
1 parent 085f022
commit 3249753
Show file tree

Hide file tree

Showing 33 changed files with 66 additions and 45 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -17,7 +17,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.5.79"
+            "BUILD_VERSION": "0.5.84"
         }
     },
     "remoteUser": "vscode",

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
 
         steps:
             - uses: Wandalen/[email protected]

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -128,7 +128,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -279,7 +279,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0

diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -30,7 +30,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             options: --user root
 
         steps:
@@ -42,6 +42,11 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
+            - name: Checkout submodules
+              run: scripts/checkout_submodules.py --shallow --platform linux
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
             - name: CI Examples Linux
               shell: bash
               run: |
@@ -53,7 +58,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.79
+            image: connectedhomeip/chip-build-esp32:0.5.84
             options: --user root
 
         steps:
@@ -65,6 +70,11 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
+            - name: Checkout submodules
+              run: scripts/checkout_submodules.py --shallow --platform esp32
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
             - name: CI Examples ESP32
               shell: bash
               run: |
@@ -76,7 +86,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.79
+            image: connectedhomeip/chip-build-nrf-platform:0.5.84
             options: --user root
 
         steps:
@@ -88,6 +98,11 @@ jobs:
                       token: ${{ github.token }}
                   attempt_limit: 3
                   attempt_delay: 2000
+            - name: Checkout submodules
+              run: scripts/checkout_submodules.py --shallow --platform nrfconnect
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: scripts/build/gn_bootstrap.sh
             - name: CI Examples NRFConnect
               shell: bash
               run: |

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -38,7 +38,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: connectedhomeip/chip-build-cirque:0.5.79
+        #             image: connectedhomeip/chip-build-cirque:0.5.84
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"

diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
@@ -82,7 +82,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-doxygen:0.5.79
+            image: connectedhomeip/chip-build-doxygen:0.5.84
 
         if: github.actor != 'restyled-io[bot]'
 

diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.5.79
+            image: connectedhomeip/chip-build-ameba:0.5.84
             options: --user root
 
         steps:

diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ti:0.5.79
+            image: connectedhomeip/chip-build-ti:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -35,7 +35,7 @@ jobs:
     if: github.actor != 'restyled-io[bot]'
 
     container:
-      image: connectedhomeip/chip-build-efr32:0.5.79
+      image: connectedhomeip/chip-build-efr32:0.5.84
       volumes:
         - "/tmp/bloat_reports:/tmp/bloat_reports"
     steps:

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.79
+            image: connectedhomeip/chip-build-esp32:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 
@@ -118,7 +118,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.79
+            image: connectedhomeip/chip-build-esp32:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-infineon:0.5.79
+            image: connectedhomeip/chip-build-infineon:0.5.84
 
         steps:
             - uses: Wandalen/[email protected]

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.79
+            image: connectedhomeip/chip-build-k32w:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-crosscompile:0.5.79
+            image: connectedhomeip/chip-build-crosscompile:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-linux-imx.yaml b/.github/workflows/examples-linux-imx.yaml
@@ -31,6 +31,11 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
+            # TODO: this image SHOULD use a newer version.
+            #
+            # NOTE: After https://github.com/project-chip/connectedhomeip/pull/19941
+            #       the image became large enough that github CI runs out of space.
+            #       The image has increased from aroud 2.5GB to 10+GB
             image: connectedhomeip/chip-build-imx:0.5.79
 
         steps:

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-mbed-os:0.5.79
+            image: connectedhomeip/chip-build-mbed-os:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.79
+            image: connectedhomeip/chip-build-nrf-platform:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.5.79
+            image: connectedhomeip/chip-build-telink:0.5.84
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-tizen:0.5.81
+            image: connectedhomeip/chip-build-tizen:0.5.84
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"

diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.79
+            image: connectedhomeip/chip-build-android:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml
@@ -31,7 +31,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.5.79
+            image: connectedhomeip/chip-build-esp32-qemu:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.79
+            image: connectedhomeip/chip-build-esp32:0.5.84
 
         steps:
             - uses: Wandalen/[email protected]
@@ -75,7 +75,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.79
+            image: connectedhomeip/chip-build-efr32:0.5.84
         steps:
             - uses: Wandalen/[email protected]
               name: Checkout

diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.79
+            image: connectedhomeip/chip-build-android:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -43,7 +43,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 
@@ -239,7 +239,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
 

diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.79
+            image: connectedhomeip/chip-build:0.5.84
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-zap:0.5.79
+            image: connectedhomeip/chip-build-zap:0.5.84
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build-zap:0.5.79
+            image: connectedhomeip/chip-build-zap:0.5.84
         defaults:
             run:
                 shell: sh

diff --git a/examples/chef/chef.py b/examples/chef/chef.py
@@ -513,6 +513,7 @@ def main(argv: Sequence[str]) -> None:
 
     if options.do_build:
         sw_ver_string = ""
+
         if options.do_automated_test_stamp:
             branch = ""
             for branch_text in shell.run_cmd("git branch", return_cmd_output=True).split("\n"):

diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.79"
+    - name: "connectedhomeip/chip-build-vscode:0.5.84"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.79"
+    - name: "connectedhomeip/chip-build-vscode:0.5.84"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args: