diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index d193dbe26..982f9f112 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -72,7 +72,6 @@ jobs: echo "PRERELEASE_REVISION=${PRERELEASE_REVISION}" >> $GITHUB_ENV echo "DOCKER_TAGS=nosqlbench/nosqlbench:${PRERELEASE_REVISION}-prerelease,nosqlbench/nosqlbench:prerelease" >> $GITHUB_ENV - - name: build prerelease revision run: | mvn package -Drevision="${{ env.PRERELEASE_REVISION }}" diff --git a/RELEASENOTES.md b/RELEASENOTES.md index d7a810bc0..d49554be8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,4 +1,5 @@ -- 801ed23ce (HEAD -> prerelease-testing, origin/prerelease-testing) fix revision var +- 1adb4e4af (HEAD -> prerelease-testing, origin/prerelease-testing) fix version, again +- 801ed23ce fix revision var - 430bee3eb fix version reference - 1f5b133f9 version fixes - 1793eb22f fixed script name diff --git a/scripts/get-prerelease-version.sh b/scripts/get-prerelease-version.sh index 5132e2533..b69960c23 100755 --- a/scripts/get-prerelease-version.sh +++ b/scripts/get-prerelease-version.sh @@ -19,4 +19,4 @@ set -e export REVISION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout) export PRERELEASE_REVISION=$(echo "${REVISION}" | cut -d'-' -f1) -printf "%s\n" "${PRERELEASE_REVISION}" +printf "%s-prerelease\n" "${PRERELEASE_REVISION}" diff --git a/scripts/release-revision.sh b/scripts/release-revision.sh deleted file mode 100755 index e1b66c5c6..000000000 --- a/scripts/release-revision.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2023 nosqlbench -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set -e -set -x - -export REVISION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout) -export PRERELEASE_REVISION=$(echo "${REVISION}" | cut -d'-' -f1) -printf "REVISION: '%s' PRERELEASE_REVISION: '%s'\n" "${REVISION}" "${PRERELEASE_REVISION}" -mvn package -Drevision="${PRERELEASE_REVISION}"