From 1a2329a743f9d9179496f0dec0f013975c8dc5f6 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 7 Nov 2023 13:27:32 -0500 Subject: [PATCH] jjb: coverity: fix for curl 8.4 We upgraded curl to work around a git clone issue but this new version doesn't support combining '--form' or '--data' with '--continue-at'. Remove the resume support that was added when the Coverity download server was flaky, they seem to have fixed the issue on their side. Change-Id: I9907a1cba903a73a8221a5ce490c39d82e2d4769 Signed-off-by: Michael Jeanson --- scripts/common/coverity.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/common/coverity.sh b/scripts/common/coverity.sh index 0b918bc..d596599 100755 --- a/scripts/common/coverity.sh +++ b/scripts/common/coverity.sh @@ -120,7 +120,13 @@ fi if [ ! -d "$TOOL_BASE" ]; then echo -e "\033[33;1mDownloading Coverity Scan Analysis Tool...\033[0m" set +x - curl --fail --remote-time --continue-at - --form project="$COVERITY_SCAN_PROJECT_NAME" --form token="$COVERITY_SCAN_TOKEN" --output "$TOOL_ARCHIVE" --time-cond "$TOOL_ARCHIVE" "$TOOL_URL" + curl --fail \ + --location \ + --remote-time \ + --form project="$COVERITY_SCAN_PROJECT_NAME" \ + --form token="$COVERITY_SCAN_TOKEN" \ + --output "$TOOL_ARCHIVE" \ + "$TOOL_URL" || rm -f "$TOOL_ARCHIVE" set -x # Extract Coverity Scan Analysis Tool -- 2.34.1