enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pipeline: force compositor to include REVISION= just like it already did for BETA=

Browse Source 
- this way the prepare step's REVISION (possibly passed via CLI parameter) is always sovereign
This commit is contained in:
Ricardo Pardini 2023-08-04 19:44:09 +02:00 committed by Igor
parent be11e171a8
commit 4624b581da
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/functions/cli/cli-jsoninfo.sh
View File

@ -145,9 +145,12 @@ function cli_json_info_run() {
if [[ ! -f "${TARGETS_OUTPUT_FILE}" ]]; then
display_alert "Generating targets inventory" "targets-compositor" "info"
export TARGETS_BETA="${BETA}" # Read by the Python script, and injected into every target as "BETA=" param.
export TARGETS_REVISION="${REVISION}" # Read by the Python script, and injected into every target as "REVISION=" param.
export TARGETS_FILTER_INCLUDE="${TARGETS_FILTER_INCLUDE}" # Read by the Python script; used to "only include" targets that match the given string.
run_host_command_logged "${PYTHON3_VARS[@]}" "${PYTHON3_INFO[BIN]}" "${INFO_TOOLS_DIR}"/targets-compositor.py "${ALL_BOARDS_ALL_BRANCHES_INVENTORY_FILE}" "not_yet_releases.json" "${TARGETS_FILE}" ">" "${TARGETS_OUTPUT_FILE}"
unset TARGETS_BETA
unset TARGETS_REVISION
unset TARGETS_FILTER_INCLUDE
fi
### Images.
@ -217,6 +220,7 @@ function cli_json_info_run() {
# 1) getting the artifact from OCI only (not build it)
# 2) getting the list of .deb's to be published to the repo for that artifact
display_alert "Generating deb-to-repo JSON output" "output-debs-to-repo-json" "info"
# This produces debs-to-repo-info.json
run_host_command_logged "${PYTHON3_VARS[@]}" "${PYTHON3_INFO[BIN]}" "${INFO_TOOLS_DIR}"/output-debs-to-repo-json.py "${BASE_INFO_OUTPUT_DIR}" "${OUTDATED_ARTIFACTS_IMAGES_FILE}"
if [[ "${ARMBIAN_COMMAND}" == "debs-to-repo-json" ]]; then
display_alert "Done with" "output-debs-to-repo-json" "ext"

2
lib/tools/info/targets-compositor.py
View File

@ -119,6 +119,8 @@ for target_name in targets["targets"]:
one_invocation_vars.update(item)
# Special case for BETA, read this from TARGETS_BETA environment and force it.
one_invocation_vars.update({"BETA": os.environ.get("TARGETS_BETA", "")})
# Special case for REVISION, read this from TARGETS_REVISION environment and force it.
one_invocation_vars.update({"REVISION": os.environ.get("TARGETS_REVISION", "")})
expanded = {"vars": one_invocation_vars, "configs": one_expansion["configs"], "pipeline": one_expansion["pipeline"]}
invocations_dict.append(expanded)