Use copy of pigweed.json maintained in Matter SDK to prevent pulling …

…in unneeded CIPD package (#29548) * Initial test to confirm issue * Remove rust CIPD package * Changed android workflow to no longer delete rust folder * Changed android smoketest workflow to no longer delete rust folder * Fix new clang tidy error * Address PR comment * Update .github/workflows/full-android.yaml Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> --------- Co-authored-by: Andrei Litvin <andy314@gmail.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
project-chip · Dec 21, 2023 · 1778292 · 1778292
1 parent b1c7cef
commit 1778292
Show file tree

Hide file tree

Showing 6 changed files with 131 additions and 14 deletions.
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
@@ -62,13 +62,10 @@ jobs:
  - name: Cleanup pigweed CIPD packages
  # This should not generally be needed, however android CI runs out of space
  # We do not need pigweed cross compile here because we use android NDK
- # compilers, so removing rust and arm compilers saves 2.5GB
+ # compilers. Removing this package saves a significant amount of space.
  run: |
- du -sh .environment/cipd/packages/pigweed/rust \
- .environment/cipd/packages/arm
-
- rm -rf .environment/cipd/packages/pigweed/rust \
- .environment/cipd/packages/arm
+ du -sh .environment/cipd/packages/arm
+ rm -rf .environment/cipd/packages/arm
  - name: Build Android arm-chip-tool
  run: |
  ./scripts/run_in_build_env.sh \

diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml
@@ -51,13 +51,10 @@ jobs:
  - name: Cleanup pigweed CIPD packages
  # This should not generally be needed, however android CI runs out of space
  # We do not need pigweed cross compile here because we use android NDK
- # compilers, so removing rust and arm compilers saves 2.5GB
+ # compilers. Removing this package save significant amount of space.
  run: |
- du -sh .environment/cipd/packages/pigweed/rust \
- .environment/cipd/packages/arm
-
- rm -rf .environment/cipd/packages/pigweed/rust \
- .environment/cipd/packages/arm
+ du -sh .environment/cipd/packages/arm
+ rm -rf .environment/cipd/packages/arm
 
  - name: Build Android CHIPTool and CHIPTest (ARM64)
  run: |

diff --git a/.restyled.yaml b/.restyled.yaml
@@ -82,6 +82,7 @@ exclude:
  - "src/controller/java/zap-generated/**/*" # not formatted: generated files
  - "scripts/setup/bootstrap.sh" # tries to quote loop variable
  - "integrations/docker/build-all.sh" # tries to quote loop variable
+ - "pigweed.json" # TODO(#29547). This file is temporary copy from pigweed repo that has minor edits. No restyle help in diff.
 
 changed_paths:
  maximum: 100000

diff --git a/pigweed.json b/pigweed.json
@@ -0,0 +1,122 @@
+{
+ "packages": [
+ {
+ "path": "gn/gn/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64",
+ "mac-amd64",
+ "mac-arm64",
+ "windows-amd64"
+ ],
+ "tags": [
+ "git_revision:991530ce394efb58fcd848195469022fa17ae126"
+ ],
+ "version_file": ".versions/gn.cipd_version"
+ },
+ {
+ "path": "infra/3pp/tools/ninja/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64",
+ "mac-amd64",
+ "mac-arm64",
+ "windows-amd64"
+ ],
+ "tags": [
+ "version:2@1.11.1.chromium.7"
+ ]
+ },
+ {
+ "path": "fuchsia/third_party/bloaty/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "mac-amd64"
+ ],
+ "tags": [
+ "git_revision:c057ba4f43db0506d4ba8c096925b054b02a8bd3"
+ ],
+ "version_file": ".versions/bloaty.cipd_version"
+ },
+ {
+ "path": "infra/3pp/tools/protoc/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64",
+ "mac-amd64",
+ "windows-amd64"
+ ],
+ "tags": [
+ "version:2@3.17.3"
+ ]
+ },
+ {
+ "_comment": "Always get the amd64 version on Mac until there's an arm64 version",
+ "path": "infra/3pp/tools/protoc/mac-amd64",
+ "platforms": [
+ "mac-arm64"
+ ],
+ "tags": [
+ "version:2@3.17.3"
+ ]
+ },
+ {
+ "path": "fuchsia/third_party/clang/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64",
+ "mac-amd64",
+ "mac-arm64",
+ "windows-amd64"
+ ],
+ "tags": [
+ "git_revision:576b184d6e3b633f51b908b61ebd281d2ecbf66f"
+ ],
+ "version_file": ".versions/clang.cipd_version"
+ },
+ {
+ "path": "infra/3pp/tools/openocd/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64",
+ "mac-amd64",
+ "mac-arm64"
+ ],
+ "tags": [
+ "version:2@0.11.0-3"
+ ]
+ },
+ {
+ "path": "pigweed/third_party/mingw64-x86_64-win32-seh/${platform}",
+ "platforms": [
+ "windows-amd64"
+ ],
+ "tags": [
+ "version:10.2.0-11"
+ ]
+ },
+ {
+ "path": "fuchsia/third_party/qemu/${platform}",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64",
+ "mac-amd64"
+ ],
+ "tags": [
+ "git_revision:a342ce9dfeed8088c426e5d51d4a7e47f3764b84"
+ ],
+ "version_file": ".versions/qemu.cipd_version"
+ },
+ {
+ "path": "fuchsia/third_party/sysroot/linux",
+ "platforms": [
+ "linux-amd64",
+ "linux-arm64"
+ ],
+ "subdir": "clang_sysroot",
+ "tags": [
+ "git_revision:d342388843734b6c5c50fb7e18cd3a76476b93aa"
+ ]
+ }
+ ]
+}
diff --git a/scripts/setup/environment.json b/scripts/setup/environment.json
@@ -1,7 +1,7 @@
 {
  "cipd_package_files": [
  "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json",
- "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+ "pigweed.json",
  "scripts/setup/python.json",
  "scripts/setup/zap.json"
  ],

diff --git a/src/transport/retransmit/tests/TestCache.cpp b/src/transport/retransmit/tests/TestCache.cpp
@@ -38,7 +38,7 @@ class TestableCache : public chip::Retransmit::Cache<KeyType, PayloadType, N>
  * Convenience add when types are trivially copyable, so no actual
  * reference needs to be created.
  */
- template <typename = std::enable_if<std::is_trivially_copyable<PayloadType>::value, int>>
+ template <std::enable_if_t<std::is_trivially_copyable<PayloadType>::value, int> = 0>
  CHIP_ERROR AddValue(const KeyType & key, PayloadType payload)
  {
  return chip::Retransmit::Cache<KeyType, PayloadType, N>::Add(key, payload);