Skip to content

Commit

Permalink
Merge branch 'master' into python/chip-repl
Browse files Browse the repository at this point in the history
  • Loading branch information
mrjerryjohns committed Nov 15, 2021
2 parents 252d4d9 + 8f23aa6 commit 3b62ae5
Show file tree
Hide file tree
Showing 769 changed files with 114,029 additions and 53,412 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"BUILD_VERSION": "0.5.25"
"BUILD_VERSION": "0.5.28"
}
},
"remoteUser": "vscode",
Expand Down
16 changes: 16 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ AppConfig
ApplicationBasic
ApplicationIdentifier
ApplicationLauncher
ApplyUpdateRequest
approver
appspot
aps
Expand Down Expand Up @@ -340,6 +341,7 @@ env
esd
ESPPORT
Espressif
esptool
eth
EthernetNetworkDiagnostics
ethernets
Expand Down Expand Up @@ -385,6 +387,7 @@ FreeRTOS
FreeRTOSConfig
fsl
fsync
fullclean
gcloud
GDB
GeneralCommissioning
Expand Down Expand Up @@ -434,6 +437,7 @@ hciconfig
hdlc
HKDF
hoc
homebrew
hostapd
hostname
href
Expand Down Expand Up @@ -486,6 +490,8 @@ itemName
iterable
jinja
jlink
jre
JDK
JLink
JLinkExe
JLinkRTTClient
Expand Down Expand Up @@ -667,6 +673,7 @@ Onboarding
onboardingcodes
oneshot
onnetwork
openjdk
OnOff
OnOffClusterTest
OnPlatformEvent
Expand All @@ -685,6 +692,11 @@ optionsMask
optionsOverride
orgs
OTA
OTAProviderIpAddress
OTAProviderNodeId
OTAProviderSerialPort
OTARequesterImpl
OTARequestorSerialPort
OTBR
otcli
PAA
Expand Down Expand Up @@ -815,6 +827,7 @@ RUNAS
RunMain
runtime
rw
RXD
sbin
scalability
scalable
Expand Down Expand Up @@ -842,6 +855,7 @@ SetpointRaiseLower
SetUpPINCode
SetupQRCode
sexualized
shubhamdp
SIGINT
SiLabs
SiliconLabs
Expand Down Expand Up @@ -952,6 +966,7 @@ ttyACMx
ttymxc
ttyUSB
TvChannel
TXD
txt
uart
UART
Expand All @@ -966,6 +981,7 @@ unblur
UNBLUR
uncommissioned
unfocus
userguide
Unicast
UniFlash
unpair
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-android:0.5.25
image: connectedhomeip/chip-build-android:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"

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 @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28

steps:
- name: Checkout
Expand Down
6 changes: 3 additions & 3 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.5.25
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"
options:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
timeout-minutes: 60

env:
DOCKER_RUN_VERSION: 0.5.25
DOCKER_RUN_VERSION: 0.5.28
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.5.25
# image: connectedhomeip/chip-build-cirque:0.5.28
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
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 @@ -43,6 +43,6 @@ jobs:
- name: Scan for vulnerabilities
uses: crazy-max/docker-scan-action@master
with:
image: connectedhomeip/chip-build${{ matrix.img }}:0.5.25
image: connectedhomeip/chip-build${{ matrix.img }}:0.5.28
annotations: true

2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ameba:0.5.25
image: connectedhomeip/chip-build-ameba:0.5.28
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-efr32:0.5.25
image: connectedhomeip/chip-build-efr32:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.5.25
image: connectedhomeip/chip-build-esp32:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-infineon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-infineon:0.5.25
image: connectedhomeip/chip-build-infineon:0.5.28

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-k32w.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-k32w:0.5.25
image: connectedhomeip/chip-build-k32w:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-mbed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-mbed-os:0.5.25
image: connectedhomeip/chip-build-mbed-os:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
/tmp/bloat_reports/
- name: Build pigweed-app example
timeout-minutes: 10
timeout-minutes: 15
run: |
scripts/examples/mbed_example.sh -a=pigweed-app -b=$APP_TARGET -p=$APP_PROFILE
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.5.25
image: connectedhomeip/chip-build-nrf-platform:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-qpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-telink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-telink:0.5.25
image: connectedhomeip/chip-build-telink:0.5.28
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-tizen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-tizen:0.5.25
image: connectedhomeip/chip-build-tizen:0.5.28
options: --user root
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qemu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32-qemu:0.5.25
image: connectedhomeip/chip-build-esp32-qemu:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build-esp32:0.5.25
image: connectedhomeip/chip-build-esp32:0.5.28

steps:
- name: Checkout
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build-efr32:0.5.25
image: connectedhomeip/chip-build-efr32:0.5.28
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28
options:
--privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
Expand Down Expand Up @@ -86,11 +86,11 @@ jobs:
- name: Run Tests
timeout-minutes: 20
run: |
scripts/tests/test_suites.sh
scripts/tests/test_suites.sh -n
- name: Run TV Tests
timeout-minutes: 10
run: |
scripts/tests/test_suites.sh -a tv
scripts/tests/test_suites.sh -n -a tv
- name: Uploading core files
uses: actions/upload-artifact@v2
if: ${{ failure() }} && ${{ !env.ACT }}
Expand Down Expand Up @@ -171,6 +171,13 @@ jobs:
timeout-minutes: 35
run: |
scripts/tests/test_suites.sh
- name: Uploading application logs
uses: actions/upload-artifact@v2
if: ${{ failure() }} && ${{ !env.ACT }}
with:
name: test-suite-app-logs-${{ matrix.type }}-${{ matrix.eventloop }}
path: /tmp/test_suites_app_logs/
retention-days: 5
- name: Uploading core files
uses: actions/upload-artifact@v2
if: ${{ failure() }} && ${{ !env.ACT }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/unit_integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.5.25
image: connectedhomeip/chip-build:0.5.28
volumes:
- "/tmp/log_output:/tmp/test_logs"
- "/tmp/happy_test_logs:/tmp/happy_test_logs"
Expand Down Expand Up @@ -84,10 +84,10 @@ jobs:
scripts/build/gn_gen.sh --args="$GN_ARGS chip_enable_happy_tests=true"
- name: Run Build
timeout-minutes: 5
timeout-minutes: 8
run: scripts/build/gn_build.sh
- name: Run Tests
timeout-minutes: 10
timeout-minutes: 15
run: RUN_HAPPY_TESTS=1 scripts/tests/gn_tests.sh
- name: Uploading Happy Test Log
uses: actions/upload-artifact@v2
Expand Down
1 change: 1 addition & 0 deletions .restyled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ exclude:
- "third_party/nanopb/repo/**/*"
- "src/android/CHIPTool/gradlew" # gradle wrapper generated file
- "third_party/android_deps/gradlew" # gradle wrapper generated file
- "scripts/tests/test_suites.sh" # overly agressive shell harden


changed_paths:
Expand Down
3 changes: 3 additions & 0 deletions build/toolchain/android/android_toolchain.gni
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ template("android_clang_toolchain") {
_ndk_host_cpu = ""
if (host_cpu == "x64") {
_ndk_host_cpu = "-x86_64"
} else if (host_cpu == "arm64") {
# until NDK 24.0.7856742-beta1, the host cpu on apple silicon is x86_64
_ndk_host_cpu = "-x86_64"
}

_ndk_host = _ndk_host_os + _ndk_host_cpu
Expand Down
2 changes: 1 addition & 1 deletion build/toolchain/ios/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ gcc_toolchain("ios_arm64") {
}
}

gcc_toolchain("ios_x86_64") {
gcc_toolchain("ios_x64") {
toolchain_args = {
current_os = "ios"
current_cpu = "x86_64"
Expand Down
Loading

0 comments on commit 3b62ae5

Please sign in to comment.