Skip to content

'cfbs build' now includes cfbs.json into the policy set #241

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

Merged
olehermanse merged 2 commits into from
Jul 2, 2025
Merged

'cfbs build' now includes cfbs.json into the policy set #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa70fad
Renamed perform_build_steps to perform_build
olehermanse Jul 2, 2025
dd63ef0
'cfbs build' now includes cfbs.json into the policy set
olehermanse Jul 2, 2025
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
5 changes: 4 additions & 1 deletion cfbs/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import os
import logging as log
import shutil
from typing import List, Tuple
from cfbs.utils import (
canonify,
Expand Down Expand Up @@ -260,7 +261,7 @@ def _perform_build_step(module, step, max_length):
write_json(path, merged)


def perform_build_steps(config) -> int:
def perform_build(config) -> int:
if not config.get("build"):
user_error("No 'build' key found in the configuration")

Expand Down Expand Up @@ -298,6 +299,8 @@ def perform_build_steps(config) -> int:
for module in config.get("build", []):
for step in module["steps"]:
_perform_build_step(module, step, module_name_length)
assert os.path.isdir("./out/masterfiles/")
shutil.copyfile("./cfbs.json", "./out/masterfiles/cfbs.json")
if os.path.isfile("out/masterfiles/def.json"):
pretty_file("out/masterfiles/def.json")
print("")
Expand Down
4 changes: 2 additions & 2 deletions cfbs/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
)
from cfbs.build import (
init_out_folder,
perform_build_steps,
perform_build,
)
from cfbs.cfbs_config import CFBSConfig, CFBSReturnWithoutCommit
from cfbs.validate import validate_config
Expand Down Expand Up @@ -803,7 +803,7 @@ def build_command(ignore_versions=False) -> int:
# so we try building anyway and don't return error(s)
init_out_folder()
_download_dependencies(config, prefer_offline=True, ignore_versions=ignore_versions)
r = perform_build_steps(config)
r = perform_build(config)
return r


Expand Down