Skip to content

Commit

Permalink
Merge branch 'master' into ameba_update_2022_11_25
Browse files Browse the repository at this point in the history
  • Loading branch information
andy31415 authored Dec 9, 2022
2 parents 6ea81d5 + 0ddcf2c commit d8e028f
Show file tree
Hide file tree
Showing 837 changed files with 71,095 additions and 54,439 deletions.
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.06"
"BUILD_VERSION": "0.6.18"
}
},
"remoteUser": "vscode",
Expand Down
7 changes: 6 additions & 1 deletion .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ contrib
controllee
conv
CopperConcentrationMeasurement
Corstone
cortexa
cp
cpio
Expand Down Expand Up @@ -676,7 +677,6 @@ instantiation
integrations
IntelliSense
InteractionModelVersion
Interation
Interoperable
introvideos
InvokeCommandRequests
Expand Down Expand Up @@ -886,6 +886,7 @@ MyPASSWORD
MySSID
NAMESERVER
NAMESPACE
namespaces
namespacing
nano
natively
Expand Down Expand Up @@ -1144,11 +1145,13 @@ rsn
RSSI
RST
rsync
RTC
rtd
RTL
rtld
RTOS
RTT
RTX
RUNAS
RunMain
runtime
Expand Down Expand Up @@ -1254,6 +1257,7 @@ subdirectory
subfolder
submodule
submodules
subnet
subprocess
SubscribeResponse
SubscriptionId
Expand Down Expand Up @@ -1326,6 +1330,7 @@ Tizen
TKIP
tlsr
TLV
TLS
tmp
tngvndl
TODO
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.6.06
image: connectedhomeip/chip-build:0.6.18

steps:
- uses: Wandalen/wretry.action@v1.0.36
Expand Down
40 changes: 30 additions & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ concurrency:
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
cancel-in-progress: true

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:

build_linux_gcc_debug:
name: Build on Linux (gcc_debug)
timeout-minutes: 85
Expand All @@ -32,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -74,7 +78,7 @@ jobs:
.environment/gn_out/.ninja_log
.environment/pigweed-venv/*.log
- name: Setup Build
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=true"
run: scripts/build/gn_gen.sh --args="chip_config_memory_debug_checks=true chip_config_memory_debug_dmalloc=false"
- name: Run Build
timeout-minutes: 20
run: scripts/run_in_build_env.sh "ninja -C ./out"
Expand Down Expand Up @@ -125,6 +129,7 @@ jobs:
# path: out/
# # objdirs are big; don't hold on to them too long.
# retention-days: 5

build_linux:
name: Build on Linux (fake, gcc_release, clang, simulated)
timeout-minutes: 150
Expand All @@ -133,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -219,7 +224,6 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/run-clang-tidy-on-compile-commands.py \
--no-log-timestamps \
--compile-database out/sanitizers/compile_commands.json \
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/' \
check \
Expand All @@ -228,18 +232,34 @@ jobs:
timeout-minutes: 60
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps \
--target linux-x64-all-clusters-ipv6only-clang \
--target linux-x64-chip-tool-ipv6only-clang \
"./scripts/build/build_examples.py \
--target linux-x64-minmdns-ipv6only-clang \
--target linux-x64-rpc-console \
build \
"
- name: Create a pre-generate directory and ensure compile-time codegen would fail
run: |
./scripts/run_in_build_env.sh "./scripts/codepregen.py ./zzz_pregenerated"
mv scripts/codegen.py scripts/codegen.py.renamed
- name: Build using build_examples.py (pregen)
timeout-minutes: 60
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target linux-x64-all-clusters-ipv6only-clang \
--target linux-x64-chip-tool-ipv6only-clang \
--pregen-dir ./zzz_pregenerated \
build \
"
- name: Undo code pre-generation changes (make compile time codegen work again)
run: |
rm -rf ./zzz_pregenerated
mv scripts/codegen.py.renamed scripts/codegen.py
- name: Run fake linux tests with build_examples
timeout-minutes: 15
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --no-log-timestamps --target linux-fake-tests build"
"./scripts/build/build_examples.py --target linux-fake-tests build"
- name: Uploading core files
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
Expand Down Expand Up @@ -279,6 +299,7 @@ jobs:
# - name: Perform CodeQL Analysis
# if: ${{ github.event_name == 'push' && github.event.ref == 'refs/heads/master' }}
# uses: github/codeql-action/analyze@v1

build_linux_python_lib:
name: Build on Linux (python_lib)
timeout-minutes: 60
Expand All @@ -287,7 +308,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.06
image: connectedhomeip/chip-build:0.6.18
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -414,7 +435,6 @@ jobs:
run: |
./scripts/run_in_build_env.sh \
"./scripts/run-clang-tidy-on-compile-commands.py \
--no-log-timestamps \
--compile-database out/default/compile_commands.json \
check \
"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

steps:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

steps:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

steps:
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: 90

env:
DOCKER_RUN_VERSION: 0.6.06
DOCKER_RUN_VERSION: 0.6.18
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.06
# image: connectedhomeip/chip-build-cirque:0.6.18
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ concurrency:
'workflow_dispatch' && github.run_number) || github.sha }}
cancel-in-progress: true

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
test_suites_chip_tool_darwin:
name: Test Suites - Darwin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:

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

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

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ concurrency:
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
cancel-in-progress: true

env:
CHIP_NO_LOG_TIMESTAMPS: true

jobs:
ameba:
name: Ameba
Expand All @@ -32,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

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

steps:
Expand Down
Loading

0 comments on commit d8e028f

Please sign in to comment.