Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
lboue authored Nov 11, 2022
2 parents 8ba7bf2 + 008df4d commit 8dc3eef
Show file tree
Hide file tree
Showing 246 changed files with 36,341 additions and 50,640 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 .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
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
24 changes: 12 additions & 12 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 Down Expand Up @@ -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 @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
options: --user root

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
options: --user root

steps:
- uses: Wandalen/[email protected].15
- uses: Wandalen/[email protected].36
name: Checkout
with:
action: actions/checkout@v3
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
options: --user root

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/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
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
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
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
6 changes: 3 additions & 3 deletions .github/workflows/examples-cc13x2x7_26x2x7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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 All @@ -57,7 +57,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:
out/artifacts/cc13x2x7_26x2x7-shell/chip-LP_CC2652R7-shell-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,cc13x2x7_26x2x7-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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 All @@ -63,7 +63,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 @@ -116,7 +116,7 @@ jobs:
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+rs911x lighting-app \
out/lighting_app_wifi_rs911x/BRD4161A/chip-efr32-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,EFR32-Examples,${{ env.GH_EVENT_PR }},${{ env.GH_EVENT_HASH }},${{ env.GH_EVENT_PARENT }},${{ github.event_name }}
Expand Down
Loading

0 comments on commit 8dc3eef

Please sign in to comment.