JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

pipeline: gha: fix IMAGES_ONLY_OUTDATED_ARTIFACTS and SKIP_IMAGES by exporting them so Python can see; tune logging

Browse Source
This commit is contained in:
Ricardo Pardini
2023-05-05 13:20:55 +02:00
parent 637c4fec01
commit b7c659c0a9
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,6 +189,9 @@ function cli_json_info_run() {
display_alert "Generating GHA matrix for images" "output-gha-matrix :: images" "info" display_alert "Generating GHA matrix for images" "output-gha-matrix :: images" "info"
declare GHA_ALL_IMAGES_JSON_MATRIX_FILE="${BASE_INFO_OUTPUT_DIR}/gha-all-images-matrix.json" declare GHA_ALL_IMAGES_JSON_MATRIX_FILE="${BASE_INFO_OUTPUT_DIR}/gha-all-images-matrix.json"
if [[ ! -f "${GHA_ALL_IMAGES_JSON_MATRIX_FILE}" ]]; then if [[ ! -f "${GHA_ALL_IMAGES_JSON_MATRIX_FILE}" ]]; then
# export env vars used by the Python script.
export SKIP_IMAGES="${SKIP_IMAGES:-"no"}"
export IMAGES_ONLY_OUTDATED_ARTIFACTS="${IMAGES_ONLY_OUTDATED_ARTIFACTS:-"no"}"
run_host_command_logged "${PYTHON3_VARS[@]}" "${PYTHON3_INFO[BIN]}" "${INFO_TOOLS_DIR}"/output-gha-matrix.py images "${OUTDATED_ARTIFACTS_IMAGES_FILE}" "${MATRIX_IMAGE_CHUNKS}" ">" "${GHA_ALL_IMAGES_JSON_MATRIX_FILE}" run_host_command_logged "${PYTHON3_VARS[@]}" "${PYTHON3_INFO[BIN]}" "${INFO_TOOLS_DIR}"/output-gha-matrix.py images "${OUTDATED_ARTIFACTS_IMAGES_FILE}" "${MATRIX_IMAGE_CHUNKS}" ">" "${GHA_ALL_IMAGES_JSON_MATRIX_FILE}"
fi fi
github_actions_add_output "image-matrix" "$(cat "${GHA_ALL_IMAGES_JSON_MATRIX_FILE}")" github_actions_add_output "image-matrix" "$(cat "${GHA_ALL_IMAGES_JSON_MATRIX_FILE}")"

2
lib/tools/common/gha.py
View File

@@ -11,7 +11,7 @@ def wrap_with_gha_expression(value):
def set_gha_output(name, value): def set_gha_output(name, value):
if os.environ.get('GITHUB_OUTPUT') is None: if os.environ.get('GITHUB_OUTPUT') is None:
log.warning(f"Environment variable GITHUB_OUTPUT is not set. Cannot set output '{name}' to '{value}'") log.debug(f"Environment variable GITHUB_OUTPUT is not set. Cannot set output '{name}' to '{value}'")
return return
with open(os.environ['GITHUB_OUTPUT'], 'a') as fh: with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:

3
lib/tools/info/output-gha-matrix.py
View File

@@ -76,9 +76,10 @@ def generate_matrix_images(info) -> list[dict]:
image = info["images"][image_id] image = info["images"][image_id]
if armbian_utils.get_from_env("IMAGES_ONLY_OUTDATED_ARTIFACTS") == "yes": if armbian_utils.get_from_env("IMAGES_ONLY_OUTDATED_ARTIFACTS") == "yes":
log.info(f"IMAGES_ONLY_OUTDATED_ARTIFACTS is set: outdated artifacts: {image['outdated_artifacts_count']} for image {image_id}")
skip = image["outdated_artifacts_count"] == 0 skip = image["outdated_artifacts_count"] == 0
if skip: if skip:
log.info(f"Skipping image {image_id} because it has no outdated artifacts") log.warning(f"Skipping image {image_id} because it has no outdated artifacts")
continue continue
if armbian_utils.get_from_env("SKIP_IMAGES") == "yes": if armbian_utils.get_from_env("SKIP_IMAGES") == "yes":