Skip to content

Commit

Permalink
Merge branch 'project-chip:master' into energy-calendar-cluster-test-…
Browse files Browse the repository at this point in the history
…scripts
  • Loading branch information
dmitrymaslovdsr authored Jun 17, 2024
2 parents 5baf1ae + 51e4846 commit d789d28
Show file tree
Hide file tree
Showing 3,148 changed files with 171,309 additions and 100,100 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 8
UseTab: Never
InsertNewlineAtEOF: true
---
Language: ObjC
BasedOnStyle: WebKit
Expand Down
9 changes: 9 additions & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ DelayedActionTime
delayedApplyActionTimeSec
delayedQueryActionTimeSec
delayQuery
deliverables
demangle
deployable
depottools
Expand Down Expand Up @@ -585,6 +586,8 @@ GenericWiFiConfigurationManagerImpl
GetDeviceId
GetDeviceInfo
GetDns
getter
getters
GetInDevelopmentTests
GetIP
getManualTests
Expand Down Expand Up @@ -727,6 +730,7 @@ JLink
JLinkExe
JLinkRTTClient
JN
jni
jpg
jre
js
Expand Down Expand Up @@ -901,12 +905,14 @@ MoveWithOnOff
MPSL
MRP
MTD
MTR
MTU
Multiband
Multicast
multilib
Multiprotocol
multithreaded
mutex
mutexes
mv
MX
Expand Down Expand Up @@ -936,6 +942,7 @@ nfds
NitricOxideConcentrationMeasurement
NitrogenDioxideConcentrationMeasurement
nl
nltest
NLUnitTest
NLUnitTests
nmcli
Expand All @@ -958,6 +965,7 @@ NTP
nullable
nullptr
NUM
NuttX
NVM
NVS
nwdiag
Expand Down Expand Up @@ -1499,6 +1507,7 @@ utils
UUID
ux
validator
valgrind
vcom
VCP
Vectorcall
Expand Down
5 changes: 4 additions & 1 deletion .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ darwin:
# (like "kiosk" or whatnot), but do allow matching "ios8" and things
# like that.
#
# Make sure we don't trigger for the string "MAC", which almost
# certainly has nothing to do with Darwin.
#
# \\b means "word boundary"
# (?![a-z]) means "there is no next char in the range a-z".
- "/(\\bios(?![a-z])|homepod|darwin|\\bmac\\b|macos)/i"
- "/(\\b[Ii][Oo][Ss](?![a-zA-Z])|[Hh][Oo][Mm][Ee][Pp][Oo][Dd]|[Dd][Aa][Rr][Ww][Ii][Nn]|\\bm[Aa][Cc]\\b|\\bMa[Cc]\\b|\\bM[Aa]c\\b|[Mm][Aa][Cc][Oo][Ss])/"

linux:
- "/(linux)/i"
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 @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54

steps:
- name: Checkout
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -281,7 +281,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -333,7 +333,7 @@ jobs:
scripts/run_in_build_env.sh 'virtualenv pyenv'
source pyenv/bin/activate
pip3 install -r src/setup_payload/python/requirements.txt
python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
build_linux_python_lighting_device:
name: Build on Linux (python lighting-app)
Expand All @@ -342,7 +342,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -371,7 +371,7 @@ jobs:
build_darwin:
name: Build on Darwin (clang, python_lib, simulated)
runs-on: macos-latest
runs-on: macos-13
if: github.actor != 'restyled-io[bot]'

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

container:
image: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/cert_test_checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Copyright (c) 2024 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Certification test checks

on:
pull_request:
paths:
- "src/app/tests/suites/certification/**"

jobs:
check-certification-tests:
name: Check for common problems in certification tests
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Run checks
run: |
python3 scripts/tests/matter_yaml_linter.py
31 changes: 31 additions & 0 deletions .github/workflows/check-data-model-directory-updates.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Copyright (c) 2024 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Check for changes to data_model directory without a sha update

on:
pull_request:
paths:
- "data_model/**"

jobs:
check-submodule-update-label:
name: Check for changes to data_model directory without a sha update
runs-on: ubuntu-latest
if: "git diff --name-only HEAD^..HEAD data_model/ | grep -q spec_sha"
steps:
- name: Error Message
run: echo This pull request attempts to update data_model directory, but is missing updates to spec_sha file with the latest version of the sha. Files in the data_model directory are generated automatically and should not be updated manually.
- name: Fail Job
run: exit 1
10 changes: 5 additions & 5 deletions .github/workflows/chef.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: ghcr.io/project-chip/chip-build:47
image: ghcr.io/project-chip/chip-build:54
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-esp32:47
image: ghcr.io/project-chip/chip-build-esp32:54
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:47
image: ghcr.io/project-chip/chip-build-nrf-platform:54
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-telink:47
image: ghcr.io/project-chip/chip-build-telink:54
options: --user root

steps:
Expand All @@ -110,7 +110,7 @@ jobs:
platform: telink
# - name: Update Zephyr to specific revision (for developers purpose)
# shell: bash
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 65dc1812431bf946dfc110682298acf83d63e27a"
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
- name: CI Examples Telink
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,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: ghcr.io/project-chip/chip-build-cirque:47
# image: ghcr.io/project-chip/chip-build-cirque:54
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ name: Darwin Tests

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
merge_group:
workflow_dispatch:
Expand Down
Loading

0 comments on commit d789d28

Please sign in to comment.