From cec4f72af0fb64dbee877cdc8eaa7e7740190a58 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 26 May 2024 09:49:20 +0800 Subject: [PATCH] try again to ignore Signed-off-by: Adrian Cole --- .github/workflows/create_release.yml | 3 +-- build-bin/deploy | 3 +-- build-bin/maven/maven_release | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index de4de95..5badfb7 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -38,7 +38,6 @@ jobs: # * needs repo:status, public_repo # * referenced in .settings.xml GH_TOKEN: ${{ secrets.GH_TOKEN }} - # TODO: remove -DignoreSnapshots=true after ES 8.14.0 is released run: | # GITHUB_REF will be refs/tags/release-MAJOR.MINOR.PATCH build-bin/git/login_git && - build-bin/maven/maven_release $(echo ${GITHUB_REF} | cut -d/ -f 3) -DignoreSnapshots=true + build-bin/maven/maven_release $(echo ${GITHUB_REF} | cut -d/ -f 3) diff --git a/build-bin/deploy b/build-bin/deploy index 4d29dd0..452007a 100755 --- a/build-bin/deploy +++ b/build-bin/deploy @@ -10,7 +10,6 @@ if [ "${version}" = "master" ]; then version=$(sed -En 's/.*(.*)<\/version>.*/\1/p' pom.xml| head -1) fi -# TODO: remove -DignoreSnapshots=true after ES 8.14.0 is released -build-bin/maven/maven_deploy -DignoreSnapshots=true +build-bin/maven/maven_deploy export RELEASE_FROM_MAVEN_BUILD=true build-bin/docker_push ${version} diff --git a/build-bin/maven/maven_release b/build-bin/maven/maven_release index f0e46aa..af848bb 100755 --- a/build-bin/maven/maven_release +++ b/build-bin/maven/maven_release @@ -31,4 +31,5 @@ if [ "$commit_local_release_branch" != "$commit_remote_release_branch" ]; then fi # Prepare and push release commits and the version tag (N.N.N), which triggers deployment. -./mvnw --batch-mode -nsu -DreleaseVersion=${release_version} -Denforcer.fail=false -Darguments="-DskipTests -Denforcer.fail=false" release:prepare $@ +# TODO: remove -DignoreSnapshots=true after ES 8.14.0 is released +./mvnw --batch-mode -nsu -DignoreSnapshots=true -DreleaseVersion=${release_version} -Denforcer.fail=false -Darguments="-DskipTests -Denforcer.fail=false" release:prepare