From 1b37a1c65c07317a2a97eb4ffc144d3e317b2853 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Fri, 6 Dec 2024 13:07:55 -0800 Subject: [PATCH] Remove test from create release script. (#1172) Signed-off-by: Artur Souza --- .github/scripts/create-release.sh | 36 +++++++++++++++---------------- .github/scripts/update_docs.sh | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/scripts/create-release.sh b/.github/scripts/create-release.sh index 9bfe8d7e1..e32ddb39b 100755 --- a/.github/scripts/create-release.sh +++ b/.github/scripts/create-release.sh @@ -84,26 +84,26 @@ fi echo "$RELEASE_BRANCH branch is ready." if [ `git rev-parse --verify $RELEASE_TAG 2>/dev/null` ]; then - echo "$RELEASE_TAG tag already exists, aborting ..." - exit 2 -fi - -${script_dir}/update_sdk_version.sh $REL_VERSION -git commit -s -m "Release $REL_VERSION" -a -if [ "$VARIANT" = "" ]; then - echo "Generating docs ..." - ${script_dir}/update_docs.sh $REL_VERSION - git commit -s -m "Generate updated javadocs for $REL_VERSION" -a -fi -git push origin $RELEASE_BRANCH + echo "$RELEASE_TAG tag already exists, checking it out ..." + git checkout $RELEASE_TAG +else + ${script_dir}/update_sdk_version.sh $REL_VERSION + git commit -s -m "Release $REL_VERSION" -a + if [ "$VARIANT" = "" ]; then + echo "Generating docs ..." + ${script_dir}/update_docs.sh $REL_VERSION + git commit -s -m "Generate updated javadocs for $REL_VERSION" -a + fi + git push origin $RELEASE_BRANCH -echo "Tagging $RELEASE_TAG ..." -git tag $RELEASE_TAG -echo "$RELEASE_TAG is tagged." + echo "Tagging $RELEASE_TAG ..." + git tag $RELEASE_TAG + echo "$RELEASE_TAG is tagged." -echo "Pushing $RELEASE_TAG tag ..." -git push origin $RELEASE_TAG -echo "$RELEASE_TAG tag is pushed." + echo "Pushing $RELEASE_TAG tag ..." + git push origin $RELEASE_TAG + echo "$RELEASE_TAG tag is pushed." +fi if [ "$VARIANT" = "" ]; then git clean -xdf diff --git a/.github/scripts/update_docs.sh b/.github/scripts/update_docs.sh index aacc4ccb7..21c6bddc7 100755 --- a/.github/scripts/update_docs.sh +++ b/.github/scripts/update_docs.sh @@ -27,5 +27,5 @@ rm -f daprdocs/content/en/java-sdk-docs/_index.mdbak || echo rm -f daprdocs/content/en/java-sdk-docs/spring-boot/_index.md/_index.mdbak || echo rm -rf docs -./mvnw -Dmaven.test.skip=false -Djacoco.skip=true clean install -./mvnw site-deploy +./mvnw -Dmaven.test.skip=true -Djacoco.skip=true clean install +./mvnw -Dmaven.test.skip=true -Djacoco.skip=true site-deploy