From 876436f34beeb7ac3227e915b8d51c5db5e0b495 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 29 Sep 2023 13:36:59 +0200 Subject: [PATCH] ci-automation/image-changes: Work around show-changes issue There's a bug in show-changes script where it defaults to values with single quotes in them. So the default scripts directory is not "scripts" but "'scripts'". This will be fixed in show-scripts, but for now work it around here by explicitly defining the directories. --- .github/workflows/ci.yaml | 3 +++ ci-automation/image_changes.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6a46c5d18d..d021dd0af7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -225,6 +225,9 @@ jobs: ) show_changes_env=( # Nothing to add. + "SCRIPTS_REPO=scripts" + "COREOS_OVERLAY_REPO=coreos-overlay" + "PORTAGE_STABLE_REPO=portage-stable" ) show_changes_params_overrides=( # We may not have a tag handy, so we tell show-changes diff --git a/ci-automation/image_changes.sh b/ci-automation/image_changes.sh index 16d271b7ca..82d9857c7e 100644 --- a/ci-automation/image_changes.sh +++ b/ci-automation/image_changes.sh @@ -63,6 +63,9 @@ function image_changes() ( show_changes_env=( # Provide a python3 command for the CVE DB parsing "PATH=${PATH}:${PWD}/ci-automation/python-bin" + "SCRIPTS_REPO=scripts" + "COREOS_OVERLAY_REPO=coreos-overlay" + "PORTAGE_STABLE_REPO=portage-stable" ) show_changes_params_overrides=( # Nothing to override.