From 6ffc17f4b71dfbdc851ccd8f57ff963f392551f5 Mon Sep 17 00:00:00 2001 From: Sascha Schwarze Date: Mon, 27 Jan 2025 10:19:37 +0100 Subject: [PATCH] Do not use issue search to determine number of issue that was just created Signed-off-by: Sascha Schwarze --- .github/report-release-vulnerabilities.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/report-release-vulnerabilities.sh b/.github/report-release-vulnerabilities.sh index e3b013312..f64965b69 100755 --- a/.github/report-release-vulnerabilities.sh +++ b/.github/report-release-vulnerabilities.sh @@ -118,21 +118,20 @@ if [ "$(jq length <<<"${issues}")" == "0" ]; then --assignee "${assignees}" \ --label release-vulnerabilities \ --title "Vulnerabilities found in latest release ${RELEASE_TAG}" \ - --body-file /tmp/report.md + --body-file /tmp/report.md | tee /tmp/gh_issue - issues="$(gh issue list --label release-vulnerabilities --json number)" - issueNumber="$(jq '.[0].number' <<<"${issues}")" + issueIdentifier="$(/dev/null 2>&1; then echo "[INFO] There is already a new tag ${nextTag} which seemingly was not yet released by a maintainer" - gh issue comment "${issueNumber}" --body "All existing vulnerabilities in ${RELEASE_TAG} can be fixed by a rebuild, but such a rebuild seemingly already exists as ${nextTag}. A maintainer must release this." + gh issue comment "${issueIdentifier}" --body "All existing vulnerabilities in ${RELEASE_TAG} can be fixed by a rebuild, but such a rebuild seemingly already exists as ${nextTag}. A maintainer must release this." else echo "[INFO] Triggering build of release ${nextTag} for branch ${RELEASE_BRANCH}" gh workflow run release.yaml \ @@ -154,6 +153,6 @@ if [ "${hasVulnerabilities}" == "true" ] && [ "${allVulnerabilitiesFixedByRebuil --raw-field "tags=${RELEASE_TAG}" \ --raw-field "release=${nextTag}" - gh issue comment "${issueNumber}" --body "Triggered a release build in branch ${RELEASE_BRANCH} for ${nextTag}. Please check whether this succeeded. A maintainer must release this." + gh issue comment "${issueIdentifier}" --body "Triggered a release build in branch ${RELEASE_BRANCH} for ${nextTag}. Please check whether this succeeded. A maintainer must release this." fi fi