This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch release-3.1.3_review
in repository https://gitbox.apache.org/repos/asf/ratis.git
commit 7dcc4d0d058b32a50575dfb7351bc37f8707e5df
Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com>
AuthorDate: Tue Dec 17 08:09:55 2024 +0100
RATIS-2211. publish-mvn fails with: ... did not assign a file to the build
artifact (#1190)
---
dev-support/make_rc.sh | 40 +++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/dev-support/make_rc.sh b/dev-support/make_rc.sh
index 0be04945e..65dbf79a1 100755
--- a/dev-support/make_rc.sh
+++ b/dev-support/make_rc.sh
@@ -91,7 +91,7 @@ mvnFun() {
MAVEN_OPTS="${mvnopts}" ${MVN} -Dmaven.repo.local="${repodir}" "$@"
}
-prepare-src() {
+1-prepare-src() {
cd "$projectdir"
git reset --hard
git clean -fdx
@@ -109,7 +109,7 @@ prepare-src() {
mvnFun clean install -DskipTests=true -Prelease -Papache-release
-Dgpg.keyname="${CODESIGNINGKEY}"
}
-prepare-bin() {
+2-verify-bin() {
echo "Cleaning up workingdir $WORKINGDIR"
rm -rf "$WORKINGDIR"
mkdir -p "$WORKINGDIR"
@@ -121,7 +121,12 @@ prepare-bin() {
mvnFun clean verify -DskipTests=true -Prelease -Papache-release
-Dgpg.keyname="${CODESIGNINGKEY}"
}
-assembly() {
+3-publish-mvn() {
+ cd "$projectdir"
+ mvnFun verify artifact:compare deploy:deploy -DdeployAtEnd=true
-DskipTests=true -Prelease -Papache-release -Dgpg.keyname="${CODESIGNINGKEY}"
"$@"
+}
+
+4-assembly() {
cd "$SVNDISTDIR"
RCDIR="$SVNDISTDIR/${RATISVERSION}/${RC#-}"
mkdir -p "$RCDIR"
@@ -135,40 +140,35 @@ assembly() {
svn add "${RATISVERSION}" || svn add "${RATISVERSION}/${RC#-}"
}
-publish-git(){
+5-publish-git(){
cd "$projectdir"
git push apache "ratis-${RATISVERSION}${RC}"
}
-publish-svn() {
+6-publish-svn() {
cd "${SVNDISTDIR}"
svn commit -m "Publish proposed version of the next Ratis release
${RATISVERSION}${RC}"
}
-publish-mvn(){
- cd "$projectdir"
- mvnFun deploy:deploy
-}
-
-if [ "$#" -ne 1 ]; then
+if [ "$#" -lt 1 ]; then
cat << EOF
-Please choose from available phases (eg. make_rc.sh prepare-src):
+Please choose from available phases (eg. make_rc.sh 1-prepare-src):
- 1. prepare-src: This is the first step. It modifies the mvn version,
creates the git tag and
+ 1-prepare-src: This is the first step. It modifies the mvn version,
creates the git tag and
builds the project to create the source artifacts.
IT INCLUDES A GIT RESET + CLEAN. ALL THE LOCAL CHANGES WILL
BE LOST!
- 2. prepare-bin: The source artifact is copied to the $WORKINGDIR and the
binary artifact is created from the source.
+ 2-verify-bin: The source artifact is copied to the $WORKINGDIR and the
binary artifact is created from the source.
This is an additional check as the the released source
artifact should be enough to build the whole project.
- 3. assembly : This step copies all the required artifacts to the svn
directory and ($SVNDISTDIR) creates the signatures/checksum files.
+ 3-publish-mvn: Performs the final build, and uploads the artifacts to the
maven staging repository
- 4. publish-git: The first remote step, only do it if everything is fine. It
pushes the rc tag to the repository.
+ 4-assembly: This step copies all the required artifacts to the svn
directory and ($SVNDISTDIR) creates the signatures/checksum files.
- 5. publish-svn: Uploads the artifacts to the apache dev staging area to
start the vote.
+ 5-publish-git: Only do it if everything is fine. It pushes the rc tag to
the repository.
- 6. publish-mvn: Uploads the artifacts to the maven staging repository
+ 6-publish-svn: Uploads the artifacts to the apache dev staging area to
start the vote.
The next steps of the release process are not scripted:
@@ -189,5 +189,7 @@ The next steps of the release process are not scripted:
EOF
else
set -x
- eval "$1"
+ func="$1"
+ shift
+ eval "$func" "$@"
fi
