From e4597b6669422e86080280549f5a565cd599af4f Mon Sep 17 00:00:00 2001 From: deusaquilus Date: Mon, 3 Jun 2019 23:52:58 -0400 Subject: [PATCH 1/4] testing with new release-plugin-settings --- .travis.yml | 2 +- build/build_test.sh | 33 +++++++++++++++++++++++++++++++++ pom.xml | 12 ++++++++---- 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100755 build/build_test.sh diff --git a/.travis.yml b/.travis.yml index bcc0a03..b77ca7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ addons: token: secure: "Gs1VzaEVvBpAlA/2FLpFYz4vpdegWnLkIcNKB3sjnKCmYXtMz3pYLq1CyQweM5+a+TI98zqq2cB4y5+osYo4z1njibkvIoAGX5+LH5j94oVw8EcBOvLK0pn2LwsVY4WGdNKf3bWr0rukAj3YbHX7rU4Z7tqDJ+daTKhgx16daz/Sl0gT7XzpkJNfPvfStOYeL1/J8mZKJeEiq7LS5yTX1i80ZSfJYj7p4juaMJTiiYyr+v46shg39Ug7z22FIpK37n8ilhFYHRzyNcA7ziTcVGrDMdqyPxq6FqQNVzMtk6Xh4MAGF/oUTCTX4s6vwnXXVhtSB+uwSItpMBcMdLMZoVnKC58nA2pcEG0OA/H3Faqsrot5ePqEpYK7NkB+S8I6X0lay6RT0+ZTCBZUTC2XT2S89gPPKAlM+P5bli5klS+09l6A2GGvXWadDMkblB5llnARhag483HMOjb+CjU7n3b5+kY7lxvFDCI3H+HbnV5baE99oJfgY1mECUzRqGqPU/1pRYnhH8DhUyXc8lWkRnl6nEG6zcU0pyDrwVJ71OjXtGxsbICFbjDzp6A77oOx11V5NAR0vtfUWO5TqL7rIFeHCQPnmtgCQwsLzqWn8q3sjWWfqMM7YJZ403fh1rJmyXVsoHW1e/ncNdd8jBkcGSfljpJgXGuv5JQ0+Yewh2g=" script: - - travis_retry ./build/build.sh + - travis_retry ./build/build_test.sh cache: directories: - $HOME/.m2/repository diff --git a/build/build_test.sh b/build/build_test.sh new file mode 100755 index 0000000..4813d07 --- /dev/null +++ b/build/build_test.sh @@ -0,0 +1,33 @@ +#!/bin/bash +set -e # Any subsequent(*) commands which fail will cause the shell script to exit immediately + +LOGBACK_CONFIG="-Dlogback.configurationFile=file://$BUILD_DIR/logback-ci.xml" +MVN="mvn --settings build/settings.xml -Drelease.arguments="$LOGBACK_CONFIG" $LOGBACK_CONFIG org.jacoco:jacoco-maven-plugin:prepare-agent " + + +openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $BUILD_DIR/pubring.gpg.enc -out $BUILD_DIR/pubring.gpg -d +openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $BUILD_DIR/secring.gpg.enc -out $BUILD_DIR/secring.gpg -d +openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $BUILD_DIR/deploy_key.pem.enc -out $BUILD_DIR/deploy_key.pem -d + +echo "Performing a release..." + +eval "$(ssh-agent -s)" +chmod 600 $BUILD_DIR/deploy_key.pem +ssh-add $BUILD_DIR/deploy_key.pem +git config --global user.name "TraneIO CI" +git config --global user.email "ci@trane.io" +git config --global push.default matching +git remote set-url origin git@github.com:traneio/ndbc.git +git fetch --unshallow +git checkout master || git checkout -b master +git reset --hard origin/master + +#git rm release.version +#git commit -m "[skip ci] [release] remove release.version" +#git push + +set -x +$MVN -B clean release:prepare release:perform +git push + +set +x diff --git a/pom.xml b/pom.xml index e14b766..4c8519c 100644 --- a/pom.xml +++ b/pom.xml @@ -119,9 +119,9 @@ - @@ -146,6 +146,10 @@ [skip ci] [release] ${release.arguments} + true + false + release + deploy @@ -170,7 +174,7 @@ ossrh-releases https://oss.sonatype.org/ - true + false From 0ba28e5629fbfb613caa0c2e3860000f130f36f3 Mon Sep 17 00:00:00 2001 From: deusaquilus Date: Tue, 4 Jun 2019 00:03:44 -0400 Subject: [PATCH 2/4] continue --- build/build_test.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/build_test.sh b/build/build_test.sh index 4813d07..7d7cbb7 100755 --- a/build/build_test.sh +++ b/build/build_test.sh @@ -18,9 +18,10 @@ git config --global user.name "TraneIO CI" git config --global user.email "ci@trane.io" git config --global push.default matching git remote set-url origin git@github.com:traneio/ndbc.git -git fetch --unshallow -git checkout master || git checkout -b master -git reset --hard origin/master + +#git fetch --unshallow +#git checkout master || git checkout -b master +#git reset --hard origin/master #git rm release.version #git commit -m "[skip ci] [release] remove release.version" From 80e32c5063462528b073c311affe32a193ac93f9 Mon Sep 17 00:00:00 2001 From: deusaquilus Date: Tue, 4 Jun 2019 00:18:10 -0400 Subject: [PATCH 3/4] continue --- .travis.yml | 2 +- build/build.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b77ca7d..bcc0a03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ addons: token: secure: "Gs1VzaEVvBpAlA/2FLpFYz4vpdegWnLkIcNKB3sjnKCmYXtMz3pYLq1CyQweM5+a+TI98zqq2cB4y5+osYo4z1njibkvIoAGX5+LH5j94oVw8EcBOvLK0pn2LwsVY4WGdNKf3bWr0rukAj3YbHX7rU4Z7tqDJ+daTKhgx16daz/Sl0gT7XzpkJNfPvfStOYeL1/J8mZKJeEiq7LS5yTX1i80ZSfJYj7p4juaMJTiiYyr+v46shg39Ug7z22FIpK37n8ilhFYHRzyNcA7ziTcVGrDMdqyPxq6FqQNVzMtk6Xh4MAGF/oUTCTX4s6vwnXXVhtSB+uwSItpMBcMdLMZoVnKC58nA2pcEG0OA/H3Faqsrot5ePqEpYK7NkB+S8I6X0lay6RT0+ZTCBZUTC2XT2S89gPPKAlM+P5bli5klS+09l6A2GGvXWadDMkblB5llnARhag483HMOjb+CjU7n3b5+kY7lxvFDCI3H+HbnV5baE99oJfgY1mECUzRqGqPU/1pRYnhH8DhUyXc8lWkRnl6nEG6zcU0pyDrwVJ71OjXtGxsbICFbjDzp6A77oOx11V5NAR0vtfUWO5TqL7rIFeHCQPnmtgCQwsLzqWn8q3sjWWfqMM7YJZ403fh1rJmyXVsoHW1e/ncNdd8jBkcGSfljpJgXGuv5JQ0+Yewh2g=" script: - - travis_retry ./build/build_test.sh + - travis_retry ./build/build.sh cache: directories: - $HOME/.m2/repository diff --git a/build/build.sh b/build/build.sh index 78ef07a..d5c89de 100755 --- a/build/build.sh +++ b/build/build.sh @@ -24,16 +24,12 @@ then git remote set-url origin git@github.com:traneio/ndbc.git git fetch --unshallow git checkout master || git checkout -b master - git reset --hard origin/master - - git rm release.version - git commit -m "[skip ci] [release] remove release.version" - git push + #git reset --hard origin/master set -x - $MVN -B clean release:prepare -DreleaseVersion=$RELEASE_VERSION - $MVN release:perform + $MVN -B clean release:prepare release:perform set +x + git push elif [[ $TRAVIS_BRANCH == "master" ]] then echo "Publishing a snapshot..." From e47871714151dcbdb807658f02d34246c668b979 Mon Sep 17 00:00:00 2001 From: deusaquilus Date: Tue, 4 Jun 2019 00:25:57 -0400 Subject: [PATCH 4/4] continue --- build/build.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/build.sh b/build/build.sh index d5c89de..b73e089 100755 --- a/build/build.sh +++ b/build/build.sh @@ -24,12 +24,17 @@ then git remote set-url origin git@github.com:traneio/ndbc.git git fetch --unshallow git checkout master || git checkout -b master - #git reset --hard origin/master + git reset --hard origin/master + + git rm release.version + git commit -m "[skip ci] [release] remove release.version" + git push set -x - $MVN -B clean release:prepare release:perform - set +x + $MVN -B clean release:prepare -DreleaseVersion=$RELEASE_VERSION + $MVN release:perform git push + set +x elif [[ $TRAVIS_BRANCH == "master" ]] then echo "Publishing a snapshot..."