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.

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

Chef CI #18859

Merged
merged 27 commits into from
Jun 6, 2022
Merged

Chef CI #18859

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f4cbde1
Squashed commit of the following:
aBozowski May 26, 2022
75d5952
Regen zzz after merge; job WAI
aBozowski May 26, 2022
828a29e
Lic
aBozowski May 26, 2022
54eca47
Squashed commit of the following:
aBozowski May 28, 2022
c8ce60f
Fix indent
aBozowski May 28, 2022
b634c91
Squashed commit of the following:
aBozowski May 31, 2022
f231c8a
Merge branch 'master' into bozowski/chef-ci-merge
aBozowski May 31, 2022
c12ba27
Squashed commit of the following:
aBozowski Jun 1, 2022
843c901
Merge branch 'master' into bozowski/chef-ci-merge
aBozowski Jun 1, 2022
ca7f2eb
chef generate_zzz
aBozowski Jun 1, 2022
c8456a7
Simplify md5
aBozowski Jun 1, 2022
6537adb
Restyle, dedent, fix instructions
aBozowski Jun 1, 2022
1b7786e
Missed type hint
aBozowski Jun 1, 2022
bfa6278
Missed return code
aBozowski Jun 1, 2022
f04b770
Squashed commit of the following:
aBozowski Jun 2, 2022
15d187b
Exclude chef zzz_generated from restyle
aBozowski Jun 2, 2022
2d471f0
Exclude restyle
aBozowski Jun 2, 2022
2e77e8d
Squashed commit of the following:
aBozowski Jun 2, 2022
9ff2798
Merge branch 'master' into bozowski/chef-ci-merge
aBozowski Jun 2, 2022
47d2065
Misspelled word
aBozowski Jun 2, 2022
c6c29ac
--generate_zzz after zap file changed in master
aBozowski Jun 3, 2022
ec4d267
propagate nrf error, fix esp32
aBozowski Jun 3, 2022
9e6f4e1
Fix overwrite
aBozowski Jun 3, 2022
7b0c85e
Merge branch 'project-chip:master' into bozowski/chef-ci-merge
aBozowski Jun 4, 2022
3869228
Fix dedents
aBozowski Jun 4, 2022
fbcc330
generate_zzz and update workflow image version
aBozowski Jun 4, 2022
37e5c88
Merge branch 'project-chip:master' into bozowski/chef-ci-merge
aBozowski Jun 6, 2022
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
Prev Previous commit
Next Next commit
Fix dedents
aBozowski committed Jun 4, 2022
commit 3869228a59a750fbfe201d99ac5930c9e1395c25
15 changes: 8 additions & 7 deletions examples/chef/chef.py
Original file line number Diff line number Diff line change
@@ -270,7 +270,7 @@ def main(argv: Sequence[str]) -> None:
if options.validate_zzz:
flush_print(f"Validating\n{_CHEF_ZZZ_ROOT}\n",
with_border=True)
fix_instructions = textwrap.dedent(f""" \
fix_instructions = textwrap.dedent("""\
Cached files out of date!
Please:
./scripts/bootstrap.sh
@@ -316,11 +316,12 @@ def main(argv: Sequence[str]) -> None:
if options.do_bootstrap_zap:
if sys.platform == "linux" or sys.platform == "linux2":
flush_print("Installing ZAP OS package dependencies")
shell.run_cmd(
textwrap.dedent(""" \
sudo apt-get install sudo apt-get install node node-yargs npm \
libpixman-1-dev libcairo2-dev libpango1.0-dev node-pre-gyp \
libjpeg9-dev libgif-dev node-typescript \""""))
install_deps_cmd = textwrap.dedent("""\
sudo apt-get install node node-yargs npm
libpixman-1-dev libcairo2-dev libpango1.0-dev node-pre-gyp
libjpeg9-dev libgif-dev node-typescript""")
install_deps_cmd = install_deps_cmd.replace("\n", " ")
shell.run_cmd(install_deps_cmd)
if sys.platform == "darwin":
flush_print("Installation of ZAP OS packages not supported on MacOS")
if sys.platform == "win32":
@@ -495,7 +496,7 @@ def main(argv: Sequence[str]) -> None:
options.sample_device_type_name,
"zap-generated")
if not os.path.exists(zzz_dir):
flush_print(textwrap.dedent(f"""
flush_print(textwrap.dedent(f"""\
You have specified --use_zzz
for device {options.sample_device_type_name}
which does not exist in the cached ZAP output.