From 6e33240301704e7429223b08b670c0733c8f27b7 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Tue, 3 Oct 2023 15:02:26 +0000 Subject: [PATCH 1/7] Initial test to confirm issue --- pigweed.json | 135 +++++++++++++++++++++++++++++++++ scripts/setup/environment.json | 2 +- 2 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 pigweed.json diff --git a/pigweed.json b/pigweed.json new file mode 100644 index 00000000000000..b93fe45a7443ec --- /dev/null +++ b/pigweed.json @@ -0,0 +1,135 @@ +{ + "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": "fuchsia/third_party/rust/${platform}", + "platforms": [ + "linux-amd64", + "linux-arm64", + "mac-amd64" + ], + "subdir": "rust", + "tags": [ + "git_revision:b7b7f2716ee1655a696d3d64c3e12638d0dd19c0" + ], + "version_file": ".versions/rust.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 index 7ded85c3b43b0a..833ffe4fa8d922 100644 --- 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" ], From d9387711329f1b52d5bddced8056c744904ff611 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Tue, 3 Oct 2023 16:28:46 +0000 Subject: [PATCH 2/7] Remove rust CIPD package --- .restyled.yaml | 1 + pigweed.json | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/.restyled.yaml b/.restyled.yaml index 24d4a52be7341a..66e9f6028345f7 100644 --- 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 index b93fe45a7443ec..3147b578705073 100644 --- a/pigweed.json +++ b/pigweed.json @@ -74,19 +74,6 @@ ], "version_file": ".versions/clang.cipd_version" }, - { - "path": "fuchsia/third_party/rust/${platform}", - "platforms": [ - "linux-amd64", - "linux-arm64", - "mac-amd64" - ], - "subdir": "rust", - "tags": [ - "git_revision:b7b7f2716ee1655a696d3d64c3e12638d0dd19c0" - ], - "version_file": ".versions/rust.cipd_version" - }, { "path": "infra/3pp/tools/openocd/${platform}", "platforms": [ From 25ad2fae6a5a5e0dd3033db583f2faa40fb684b4 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Tue, 3 Oct 2023 16:44:57 +0000 Subject: [PATCH 3/7] Changed android workflow to no longer delete rust folder --- .github/workflows/full-android.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index ee6fc243218531..ec6265931ee9a9 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -64,11 +64,8 @@ jobs: # We do not need pigweed cross compile here because we use android NDK # compilers, so removing rust and arm compilers saves 2.5GB 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 \ From fa04c6f20a218ed795f7210749d231cd1912fdde Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Tue, 3 Oct 2023 16:56:35 +0000 Subject: [PATCH 4/7] Changed android smoketest workflow to no longer delete rust folder --- .github/workflows/smoketest-android.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index d97d55fbd11073..488624263111b8 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -53,11 +53,8 @@ jobs: # We do not need pigweed cross compile here because we use android NDK # compilers, so removing rust and arm compilers saves 2.5GB 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: | From fbf0768445a6889cfbac490d7cc58778cf15e57d Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Wed, 4 Oct 2023 12:34:58 +0000 Subject: [PATCH 5/7] Fix new clang tidy error --- src/transport/retransmit/tests/TestCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transport/retransmit/tests/TestCache.cpp b/src/transport/retransmit/tests/TestCache.cpp index aac0b424c37080..8a619e9d1271cc 100644 --- a/src/transport/retransmit/tests/TestCache.cpp +++ b/src/transport/retransmit/tests/TestCache.cpp @@ -38,7 +38,7 @@ class TestableCache : public chip::Retransmit::Cache * Convenience add when types are trivially copyable, so no actual * reference needs to be created. */ - template ::value, int>> + template ::value, int> = 0> CHIP_ERROR AddValue(const KeyType & key, PayloadType payload) { return chip::Retransmit::Cache::Add(key, payload); From 94b9c6fb32c414308ecff2efed600727a0ae0b7e Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Wed, 4 Oct 2023 16:38:12 +0000 Subject: [PATCH 6/7] Address PR comment --- .github/workflows/full-android.yaml | 2 +- .github/workflows/smoketest-android.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index ec6265931ee9a9..848f89e4425773 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -62,7 +62,7 @@ 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/arm rm -rf .environment/cipd/packages/arm diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 488624263111b8..14d98dd5544b1f 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -51,7 +51,7 @@ 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/arm rm -rf .environment/cipd/packages/arm From 9d4287508965f47009d08f20fc4e2ac5600aa08d Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 5 Oct 2023 00:15:26 -0400 Subject: [PATCH 7/7] Update .github/workflows/full-android.yaml Co-authored-by: Boris Zbarsky --- .github/workflows/full-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 848f89e4425773..2fdee8ea806308 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -62,7 +62,7 @@ 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. Removing this package save significant amount of space. + # compilers. Removing this package saves a significant amount of space. run: | du -sh .environment/cipd/packages/arm rm -rf .environment/cipd/packages/arm