From c69def3fb82a600833242638f4977be5feb5caef Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 11 Oct 2020 17:52:48 +0200 Subject: [PATCH] Update pom.template.xml, deploy_release.sh, and setup_variables.sh --- pom.template.xml | 45 ++++++++++++++++++++++++++++++++++++++- scripts/deploy_release.sh | 11 +++++++++- travis/setup_variables.sh | 2 ++ 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/pom.template.xml b/pom.template.xml index 62d1370..092cb76 100644 --- a/pom.template.xml +++ b/pom.template.xml @@ -2,11 +2,12 @@ 4.0.0 it.tdlight ${IMPLEMENTATION_NAME}-natives-${OPERATING_SYSTEM_NAME}-${CPU_ARCHITECTURE_NAME} - 3.0.0-SNAPSHOT + 3.0.${revision} ${IMPLEMENTATION_NAME} natives for ${OPERATING_SYSTEM_NAME} (${CPU_ARCHITECTURE_NAME}) jar UTF-8 + 0-SNAPSHOT @@ -45,6 +46,48 @@ 1.8 + + maven-scm-plugin + 1.11.2 + + ${project.artifactId}-${project.version} + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + https://mvn.mchv.eu/ + mchv + + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + org.apache.maven.plugins maven-release-plugin diff --git a/scripts/deploy_release.sh b/scripts/deploy_release.sh index f92a3c0..040382a 100755 --- a/scripts/deploy_release.sh +++ b/scripts/deploy_release.sh @@ -1,7 +1,16 @@ #!/bin/bash -e +# REQUIRED PARAMETERS: +# REVISION = + +# Check variables correctness +if [ -z "${REVISION}" ]; then + echo "Missing parameter: REVISION" + exit 1 +fi + cd ../generated -mvn -DpushChanges=false -DlocalCheckout=true -DpreparationGoals=initialize release:prepare release:perform -B +mvn -B -Drevision=${REVISION} deploy echo "Done." exit 0 diff --git a/travis/setup_variables.sh b/travis/setup_variables.sh index 283219f..0232d0b 100755 --- a/travis/setup_variables.sh +++ b/travis/setup_variables.sh @@ -2,6 +2,7 @@ set -e # ====== Variables +export REVISION=$TRAVIS_BUILD_NUMBER export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then export CPU_ARCHITECTURE_NAME="aarch64" @@ -52,6 +53,7 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then fi # ====== Print variables +echo "REVISION=${REVISION}" echo "TD_SRC_DIR=${TD_SRC_DIR}" echo "TD_BIN_DIR=${TD_BIN_DIR}" echo "TDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR}"