Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use copy of pigweed.json maintained in Matter SDK to prevent pulling in unneeded CIPD package #29548

Merged
merged 8 commits into from
Oct 5, 2023
Merged

Use copy of pigweed.json maintained in Matter SDK to prevent pulling in unneeded CIPD package #29548

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e33240
Initial test to confirm issue
tehampson Oct 3, 2023
d938771
Remove rust CIPD package
tehampson Oct 3, 2023
25ad2fa
Changed android workflow to no longer delete rust folder
tehampson Oct 3, 2023
fa04c6f
Changed android smoketest workflow to no longer delete rust folder
tehampson Oct 3, 2023
fbf0768
Fix new clang tidy error
tehampson Oct 4, 2023
94b9c6f
Address PR comment
tehampson Oct 4, 2023
9d42875
Update .github/workflows/full-android.yaml
andy31415 Oct 5, 2023
408e750
Merge branch 'master' into remove-rust-cipd-package-1003
tehampson Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions .github/workflows/full-android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
tehampson marked this conversation as resolved.
Show resolved Hide resolved
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 \
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/smoketest-android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
1 change: 1 addition & 0 deletions .restyled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
122 changes: 122 additions & 0 deletions pigweed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
]
}
]
}
2 changes: 1 addition & 1 deletion scripts/setup/environment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
],
Expand Down