Skip to content

Commit

Permalink
Merge branch 'master' into feature/contribution-thread
Browse files Browse the repository at this point in the history
  • Loading branch information
msandstedt authored Nov 17, 2022
2 parents b417187 + 3edba4a commit 544bd2b
Show file tree
Hide file tree
Showing 1,009 changed files with 130,975 additions and 138,995 deletions.
1 change: 1 addition & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RUN chown -R $USERNAME:$USERNAME /opt/android/sdk
RUN chown -R $USERNAME:$USERNAME /opt/ameba/ambd_sdk_with_chip_non_NDA/

# NXP uses a patch_sdk script to change SDK files
RUN mkdir -p /opt/sdk/sdks/
RUN chown -R $USERNAME:$USERNAME /opt/sdk/sdks/

RUN chown -R $USERNAME:$USERNAME /opt/fsl-imx-xwayland/5.15-kirkstone/
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.6.03"
"BUILD_VERSION": "0.6.06"
}
},
"remoteUser": "vscode",
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ updates:
allow:
- dependency-name: "third_party/pigweed/repo"
- dependency-name: "third_party/mbedtls/repo"
- dependancy-name: "third_party/openthread/repo"
- dependency-name: "third_party/openthread/repo"
4 changes: 2 additions & 2 deletions .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.6.05
image: connectedhomeip/chip-build:0.6.06

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.05
image: connectedhomeip/chip-build:0.6.06
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand All @@ -47,7 +47,7 @@ jobs:
env:
CONCURRENCY_CONTEXT: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
run: echo "$CONCURRENCY_CONTEXT"
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand All @@ -66,7 +66,7 @@ jobs:
timeout-minutes: 10
run: scripts/build/gn_bootstrap.sh
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && !env.ACT }}
with:
name: bootstrap-logs
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
timeout-minutes: 20
run: scripts/run_in_build_env.sh "ninja -C ./out"
- name: Uploading core files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: crash-core-linux-gcc-debug
Expand All @@ -118,7 +118,7 @@ jobs:
# If re-enabling, some subset of this should be picked
#
# - name: Uploading objdir for debugging
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v3
# if: ${{ failure() && !env.ACT }}
# with:
# name: crash-objdir-linux-gcc-debug
Expand All @@ -133,7 +133,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.05
image: connectedhomeip/chip-build:0.6.06
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand All @@ -148,7 +148,7 @@ jobs:
env:
CONCURRENCY_CONTEXT: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
run: echo "$CONCURRENCY_CONTEXT"
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand All @@ -172,7 +172,7 @@ jobs:
timeout-minutes: 10
run: scripts/build/gn_bootstrap.sh
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && !env.ACT }}
with:
name: bootstrap-logs
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target linux-fake-tests build"
- name: Uploading core files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: crash-core-linux
Expand All @@ -254,7 +254,7 @@ jobs:
# If re-enabling, some subset of this should be picked
#
# - name: Uploading objdir for debugging
# uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v3
# if: ${{ failure() && !env.ACT }}
# with:
# name: crash-objdir-linux
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.05
image: connectedhomeip/chip-build:0.6.06
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand All @@ -302,7 +302,7 @@ jobs:
env:
CONCURRENCY_CONTEXT: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
run: echo "$CONCURRENCY_CONTEXT"
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -336,7 +336,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -368,7 +368,7 @@ jobs:
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && !env.ACT }}
with:
name: bootstrap-logs
Expand Down Expand Up @@ -419,7 +419,7 @@ jobs:
check \
"
- name: Uploading diagnostic logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: crash-log-darwin
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.05
image: connectedhomeip/chip-build:0.6.06
options: --user root

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand All @@ -57,11 +57,11 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.6.05
image: connectedhomeip/chip-build-esp32:0.6.06
options: --user root

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand All @@ -85,11 +85,11 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.6.05
image: connectedhomeip/chip-build-nrf-platform:0.6.06
options: --user root

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
timeout-minutes: 90

env:
DOCKER_RUN_VERSION: 0.6.05
DOCKER_RUN_VERSION: 0.6.06
GITHUB_CACHE_PATH: /tmp/cirque-cache/

runs-on: ubuntu-latest
Expand All @@ -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.6.05
# image: connectedhomeip/chip-build-cirque:0.6.06
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand All @@ -48,7 +48,7 @@ jobs:
# options: "--privileged"

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
--volume /dev/pts:/dev/pts \
-- scripts/tests/cirque_tests.sh run_all_tests
- name: Uploading Binaries
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && !env.ACT }}
with:
name: cirque_log-${{steps.outsuffix.outputs.value}}-logs
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && !env.ACT }}
with:
name: bootstrap-logs-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
Expand Down Expand Up @@ -116,21 +116,21 @@ jobs:
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
"
- name: Uploading core files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: crash-core-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
path: /cores/
# Cores are big; don't hold on to them too long.
retention-days: 5
- name: Uploading diagnostic logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: crash-log-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
path: ~/Library/Logs/DiagnosticReports/
- name: Uploading objdir for debugging
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: crash-objdir-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand All @@ -56,7 +56,7 @@ jobs:
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
- name: Uploading bootstrap logs
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ always() && !env.ACT }}
with:
name: bootstrap-logs
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella -Wno-unguarded-availability-new' > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
working-directory: src/darwin/Framework
- name: Uploading log files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: darwin-framework-test-logs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_img.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
#- "-vscode"
- "-zap"
steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build-doxygen:0.6.05
image: connectedhomeip/chip-build-doxygen:0.6.06

if: github.actor != 'restyled-io[bot]'

steps:
- name: "Print Actor"
run: echo ${{github.actor}}
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ameba:0.6.05
image: connectedhomeip/chip-build-ameba:0.6.06
options: --user root

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
out/bouffalolab-bl602-iot-matter-v1-light-115200-rpc/chip-bl602-lighting-example.out /tmp/bloat_reports/
- name: Uploading Size Reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ !env.ACT }}
with:
name: Size,BL602-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
Expand All @@ -91,7 +91,7 @@ jobs:
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
out/bouffalolab-xt-zb6-devkit-light-115200-rpc/chip-bl702-lighting-example.out /tmp/bloat_reports/
- name: Uploading Size Reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
if: ${{ !env.ACT }}
with:
name: Size,BL702-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
Expand Down
Loading

0 comments on commit 544bd2b

Please sign in to comment.