Skip to content

Commit 1ff61d8

Browse files
committed
Fix comparison
1 parent c7cb9df commit 1ff61d8

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

roles/generate-jenkins/templates/EXTERNAL_TRIGGER.j2

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,10 @@ jobs:
9191
echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY
9292
exit 0
9393
{% endif %}
94-
if $SKIPVER=$(awk -NF '_' '{print $3}' <<< "${SKIP_EXTERNAL_TRIGGER}"); then
95-
if [[ "${SKIPVER}" == ${EXT_RELEASE} ]]; then
96-
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
97-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
98-
exit 0
99-
fi
94+
if grep -q "^{{ project_name }}_{{ ls_branch }}_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
95+
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
96+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
97+
exit 0
10098
fi
10199
{% if custom_version_command is defined or external_type != "os" %}
102100
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then

0 commit comments

Comments
 (0)