From 62a765a7615f7f3f8a4716bd558564fc710c6f98 Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Sun, 27 Nov 2022 17:49:34 -0800 Subject: [PATCH] infra: diable new curl option as it absent in CI and my local --- .../checkstyle_non_main_files_suppressions.xml | 1 + release.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config/checkstyle_non_main_files_suppressions.xml b/config/checkstyle_non_main_files_suppressions.xml index 3c4287c04f4..2810b8c5dcf 100644 --- a/config/checkstyle_non_main_files_suppressions.xml +++ b/config/checkstyle_non_main_files_suppressions.xml @@ -167,5 +167,6 @@ + diff --git a/release.sh b/release.sh index c9e38af8ea4..cd263c807c1 100755 --- a/release.sh +++ b/release.sh @@ -64,7 +64,7 @@ FUTURE_RELEASE=$(xmlstarlet sel -N pom=http://maven.apache.org/POM/4.0.0 \ TKN=$(cat ~/.m2/token-checkstyle.txt) echo "Updating Github tag page" -curl --fail-with-body -i -H "Authorization: token $TKN" \ +curl -i -H "Authorization: token $TKN" \ -d "{ \"tag_name\": \"checkstyle-$NEW_RELEASE\", \ \"target_commitish\": \"master\", \ \"name\": \"\", \ @@ -73,19 +73,19 @@ curl --fail-with-body -i -H "Authorization: token $TKN" \ -X POST https://api.github.com/repos/checkstyle/checkstyle/releases echo "Publishing 'all' jar to Github" -RELEASE_ID=$(curl --fail-with-body -s -X GET \ +RELEASE_ID=$(curl -s -X GET \ https://api.github.com/repos/checkstyle/checkstyle/releases/tags/checkstyle-"$NEW_RELEASE" \ | jq ".id") -curl --fail-with-body -i -H "Authorization: token $TKN" \ +curl -i -H "Authorization: token $TKN" \ -H "Content-Type: application/zip" \ --data-binary @"target/checkout/target/checkstyle-$NEW_RELEASE-all.jar" \ -X POST https://uploads.github.com/repos/checkstyle/checkstyle/releases/"$RELEASE_ID"/assets?name=checkstyle-"$NEW_RELEASE"-all.jar echo "Close previous milestone at github" -MILESTONE_ID=$(curl --fail-with-body -s \ +MILESTONE_ID=$(curl -s \ -X GET https://api.github.com/repos/checkstyle/checkstyle/milestones?state=open \ | jq ".[0] | .number") -curl --fail-with-body -i -H "Authorization: token $TKN" \ +curl -i -H "Authorization: token $TKN" \ -d "{ \"state\": \"closed\" }" \ -X PATCH https://api.github.com/repos/checkstyle/checkstyle/milestones/"$MILESTONE_ID" @@ -95,7 +95,7 @@ LAST_SUNDAY_DAY=$(cal -d "$(date -d "next month" +"%Y-%m")" \ | awk '/^ *[0-9]/ { d=$1 } END { print d }') LAST_SUNDAY_DATETIME=$(date -d "next month" +"%Y-%m")"-$LAST_SUNDAY_DAY""T08:00:00Z" echo "$LAST_SUNDAY_DATETIME" -curl --fail-with-body -i -H "Authorization: token $TKN" \ +curl -i -H "Authorization: token $TKN" \ -d "{ \"title\": \"$FUTURE_RELEASE\", \ \"state\": \"open\", \ \"description\": \"\", \ @@ -104,14 +104,14 @@ curl --fail-with-body -i -H "Authorization: token $TKN" \ -X POST https://api.github.com/repos/checkstyle/checkstyle/milestones echo "Creation of issue in eclipse-cs repo ..." -curl --fail-with-body -i -H "Authorization: token $TKN" \ +curl -i -H "Authorization: token $TKN" \ -d "{ \"title\": \"upgrade to checkstyle $NEW_RELEASE\", \ \"body\": \"https://checkstyle.org/releasenotes.html#Release_$NEW_RELEASE\" \ }" \ -X POST https://api.github.com/repos/checkstyle/eclipse-cs/issues echo "Creation of issue in sonar-checkstyle repo ..." -curl --fail-with-body -i -H "Authorization: token $TKN" \ +curl -i -H "Authorization: token $TKN" \ -d "{ \"title\": \"upgrade to checkstyle $NEW_RELEASE\", \ \"body\": \"https://checkstyle.org/releasenotes.html#Release_$NEW_RELEASE\" \ }" \