Skip to content

Commit

Permalink
Merge branch 'master' into tlv_reader_real
Browse files Browse the repository at this point in the history
  • Loading branch information
mwswartwout authored Feb 20, 2024
2 parents 940bf6a + 6350333 commit 04d327d
Show file tree
Hide file tree
Showing 570 changed files with 23,752 additions and 7,068 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"mounts": [
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
],
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
"image": "matter-dev-environment:local",
"remoteUser": "vscode",
"customizations": {
Expand Down
3 changes: 2 additions & 1 deletion .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,7 @@ epochStartTime
eq
errorValue
esd
espcoredump
ESPPORT
Espressif
esptool
Expand Down Expand Up @@ -1621,4 +1622,4 @@ zephyrproject
zhengyaohan
Zigbee
zigbeealliance
zigbeethread
zigbeethread
4 changes: 2 additions & 2 deletions .github/workflows/cherry-picks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
(github.event.pull_request.merged == true)
&& (
(contains(github.event.pull_request.labels.*.name, 'sve'))
|| (contains(github.event.pull_request.labels.*.name, 'spec'))
|| (contains(github.event.pull_request.labels.*.name, 'request sve'))
|| (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
)
Expand All @@ -27,11 +26,12 @@ jobs:
uses: carloscastrojumo/[email protected]
with:
token: ${{ secrets.MATTER_PAT }}
branch: sve-2
branch: 1.3-sve
labels: |
sve cherry pick
reviewers: |
woody-apple
andy31415
raju-apple
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
--target darwin-x64-bridge-${BUILD_VARIANT} \
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
--target darwin-x64-rvc-${BUILD_VARIANT} \
build \
--copy-artifacts-to objdir-clone \
"
Expand All @@ -120,6 +121,7 @@ jobs:
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
"
- name: Run OTA Test
run: |
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: ghcr.io/project-chip/chip-build-efr32:35
image: ghcr.io/project-chip/chip-build-efr32:36
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/examples-tv-app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright (c) 2023 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: Build example - TV App and TV Casting App

on:
push:
pull_request:
merge_group:

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:
tv-app:
name: TV App

env:
BUILD_TYPE: tv_app

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-android:35
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout submodules & Bootstrap
uses: ./.github/actions/checkout-submodules-and-bootstrap
with:
platform: android
- name: Set up environment for size reports
uses: ./.github/actions/setup-size-reports
if: ${{ !env.ACT }}
with:
gh-context: ${{ toJson(github) }}
- name: Build Android arm64-tv-casting-app
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
- name: Clean out build output
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
- name: Build Android arm64-tv-server
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
- name: Clean out build output
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
- name: Uploading Size Reports
uses: ./.github/actions/upload-size-reports
if: ${{ !env.ACT }}
with:
platform-name: TVApp
14 changes: 0 additions & 14 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,35 +93,25 @@ jobs:
--known-failure app/AttributeAccessInterface.h \
--known-failure app/AttributeAccessToken.h \
--known-failure app/att-storage.h \
--known-failure app/BufferedReadCallback.h \
--known-failure app/CommandHandler.h \
--known-failure app/CommandHandlerInterface.h \
--known-failure app/CommandPathParams.h \
--known-failure app/CommandPathRegistry.h \
--known-failure app/CommandResponseSender.h \
--known-failure app/CommandSender.h \
--known-failure app/CommandSenderLegacyCallback.h \
--known-failure app/CompatEnumNames.h \
--known-failure app/ConcreteAttributePath.h \
--known-failure app/ConcreteCommandPath.h \
--known-failure app/data-model/ListLargeSystemExtensions.h \
--known-failure app/EventHeader.h \
--known-failure app/EventLoggingDelegate.h \
--known-failure app/EventLogging.h \
--known-failure app/EventLoggingTypes.h \
--known-failure app/EventManagement.h \
--known-failure app/InteractionModelHelper.h \
--known-failure app/ObjectList.h \
--known-failure app/ReadClient.h \
--known-failure app/ReadHandler.h \
--known-failure app/ReadPrepareParams.h \
--known-failure app/reporting/tests/MockReportScheduler.cpp \
--known-failure app/reporting/tests/MockReportScheduler.h \
--known-failure app/server/AppDelegate.h \
--known-failure app/TestEventTriggerDelegate.h \
--known-failure app/util/af.h \
--known-failure app/util/af-types.h \
--known-failure app/util/attribute-metadata.h \
--known-failure app/util/attribute-storage.cpp \
--known-failure app/util/attribute-storage.h \
--known-failure app/util/attribute-storage-null-handling.h \
Expand All @@ -141,11 +131,7 @@ jobs:
--known-failure app/util/im-client-callbacks.h \
--known-failure app/util/MatterCallbacks.h \
--known-failure app/util/message.cpp \
--known-failure app/util/mock/Constants.h \
--known-failure app/util/mock/Functions.h \
--known-failure app/util/mock/MockNodeConfig.h \
--known-failure app/util/odd-sized-integers.h \
--known-failure app/util/types_stub.h \
--known-failure app/util/util.cpp \
--known-failure app/util/util.h \
--known-failure app/WriteClient.h \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build-efr32:35
image: ghcr.io/project-chip/chip-build-efr32:36
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit 04d327d

Please sign in to comment.