Merge branch 'master' into addopstatetocitests

project-chip · Jul 17, 2023 · 4f64e01 · 4f64e01
2 parents 0fb5422 + 98c6716
commit 4f64e01
Show file tree

Hide file tree

Showing 380 changed files with 4,866 additions and 7,907 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -15,7 +15,8 @@
 ARG BUILD_VERSION
 
 # All tools required for compilation belong in chip-build, forms "truth" for CHIP build tooling
-FROM connectedhomeip/chip-build-vscode:${BUILD_VERSION}
+FROM ghcr.io/project-chip/chip-build-vscode:${BUILD_VERSION}
+LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
 # This Dockerfile contains things useful for an interactive development environment
 ARG USERNAME=vscode

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -14,7 +14,7 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 0.7.3",
+    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "customizations": {

diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -590,6 +590,7 @@ getManualTests
 getstarted
 getTests
 GH
+ghcr
 ghp
 githubusercontent
 gitignore

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -33,7 +33,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.7.3
+            image: ghcr.io/project-chip/chip-build:1
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.7.3
+            image: ghcr.io/project-chip/chip-build:1
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -131,7 +131,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.7.3
+            image: ghcr.io/project-chip/chip-build:1
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -275,7 +275,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.7.3
+            image: ghcr.io/project-chip/chip-build:1
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -397,7 +397,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.7.3
+            image: ghcr.io/project-chip/chip-build:1
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0

diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.7.16
+            image: ghcr.io/project-chip/chip-build:1
             options: --user root
 
         steps:
@@ -54,7 +54,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.7.16
+            image: ghcr.io/project-chip/chip-build-esp32:1
             options: --user root
 
         steps:
@@ -75,7 +75,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.7.16
+            image: ghcr.io/project-chip/chip-build-nrf-platform:1
             options: --user root
 
         steps:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
@@ -15,50 +15,158 @@
 name: Docker CHIP images
 
 on:
+    workflow_call:
+        inputs:
+          push_images:
+            required: false
+            type: boolean
+            default: false
     push:
         paths:
-            - "integrations/docker/images/**"
+            - "integrations/docker/**"
     pull_request:
         paths:
-            - "integrations/docker/images/**"
+            - "integrations/docker/**"
     workflow_dispatch:
-
+        inputs:
+            push_images:
+              required: false
+              type: boolean
+              default: false
+
 jobs:
-    build_images:
-        name: Build Docker CHIP Build images
+    build_images_base:
+        name: Build Docker CHIP Build images - base
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
         strategy:
             fail-fast: false
             matrix:
                 img:
                     - ""
-                    - "-ameba"
-                    - "-android"
-                    - "-cirque"
+                    - "-minimal"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Build & Push images using project bash script
+              if: ${{ inputs.push_images == true }}
+              run: |
+                  cd integrations/docker/images/base/chip-build${{ matrix.img }}
+                  ./build.sh --latest --push
+            - name: Build images using project bash script
+              if: ${{ inputs.push_images == false }}
+              run: |
+                  cd integrations/docker/images/base/chip-build${{ matrix.img }}
+                  ./build.sh --latest
+    build_images_stage_1:
+        needs: [build_images_base]
+        name: Build Docker CHIP Build images - stage 1
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+        strategy:
+            fail-fast: false
+            matrix:
+                img:
                     - "-crosscompile"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Build & Push images using project bash script
+              if: ${{ inputs.push_images == true }}
+              run: |
+                  cd integrations/docker/images/stage-1/chip-build${{ matrix.img }}
+                  ./build.sh --latest --push
+            - name: Build images using project bash script
+              if: ${{ inputs.push_images == false }}
+              run: |
+                  cd integrations/docker/images/stage-1/chip-build${{ matrix.img }}
+                  ./build.sh --latest
+    build_images_stage_2:
+        needs: [build_images_base, build_images_stage_1]
+        name: Build Docker CHIP Build images - stage 2
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+        strategy:
+            fail-fast: false
+            matrix:
+                img:
+                    - "-ameba"
+                    - "-asr"
+                    - "-bouffalolab"
                     - "-doxygen"
                     - "-efr32"
                     - "-esp32"
-                    - "-esp32-qemu"
                     - "-infineon"
                     # NOTE: imx image requires too much space for GitHub-hosted runners. It fails with:
                     # ApplyLayer exit status 1 stdout:  stderr: write /opt/fsl-imx-xwayland/5.15-kirkstone/sysroots/armv8a-poky-linux/opt/ltp/testcases/bin/fanotify15: no space left on device
                     # - "-imx"
+                    - "-java"
                     - "-k32w"
                     - "-mbed-os"
                     - "-nrf-platform"
                     - "-telink"
                     - "-ti"
                     - "-tizen"
-                    - "-tizen-qemu"
                     - "-openiotsdk"
-                    # NOTE: vscode image consumes ~52 GB disk space but GitHub-hosted runners provide ~10 GB free disk space(https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources)
-                    #- "-vscode"
         steps:
             - name: Checkout
               uses: actions/checkout@v3
-            - name: Build All images using project bash script
+            - name: Build & Push images using project bash script
+              if: ${{ inputs.push_images == true }}
+              run: |
+                  cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
+                  ./build.sh --latest --push
+            - name: Build images using project bash script
+              if: ${{ inputs.push_images == false }}
+              run: |
+                  cd integrations/docker/images/stage-2/chip-build${{ matrix.img }}
+                  ./build.sh --latest
+                    
+    build_images_stage_3:
+        needs: [build_images_base, build_images_stage_1, build_images_stage_2]
+        name: Build Docker CHIP Build images - stage 3
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+        strategy:
+            fail-fast: false
+            matrix:
+                img:
+                    - "-android"
+                    - "-esp32-qemu"
+                    - "-tizen-qemu"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Build & Push images using project bash script
+              if: ${{ inputs.push_images == true }}
+              run: |
+                  cd integrations/docker/images/stage-3/chip-build${{ matrix.img }}
+                  ./build.sh --latest --push
+            - name: Build images using project bash script
+              if: ${{ inputs.push_images == false }}
+              run: |
+                  cd integrations/docker/images/stage-3/chip-build${{ matrix.img }}
+                  ./build.sh --latest
+    build_images_vscode:
+        needs: [build_images_base, build_images_stage_1, build_images_stage_2, build_images_stage_3]
+        name: Build Docker CHIP Build images - vscode
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]' && false
+        strategy:
+            fail-fast: false
+            matrix:
+                img:
+                    - "-vscode"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
+            - name: Build & Push images using project bash script
+              if: ${{ inputs.push_images == true }}
+              run: |
+                  cd integrations/docker/images/vscode/chip-build${{ matrix.img }}
+                  ./build.sh --latest --push
+            - name: Build images using project bash script
+              if: ${{ inputs.push_images == false }}
               run: |
-                  cd integrations/docker/images/chip-build${{ matrix.img }}
+                  cd integrations/docker/images/vscode-3/chip-build${{ matrix.img }}
                   ./build.sh --latest