From ed6b9004ea882d2a04b46121e25ac678481b7e6e Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Fri, 9 Dec 2016 16:40:20 -0800 Subject: [PATCH] Issue #3632: releasenotes generation was moved to separate shell file --- .ci/README.md | 7 ++++++ .ci/travis/travis.sh | 6 ++--- .ci/travis/xtr_releasenotes-gen.sh | 40 ++++++++++++++++++++++++++++++ .travis.yml | 19 ++------------ 4 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 .ci/README.md create mode 100755 .ci/travis/xtr_releasenotes-gen.sh diff --git a/.ci/README.md b/.ci/README.md new file mode 100644 index 000000000..fdfd740df --- /dev/null +++ b/.ci/README.md @@ -0,0 +1,7 @@ +ATTENTION: + All scripts in this folder expect to be launched from root folder of repository + +Example of usage: + export GOAL="all-sevntu-checks" && ./.ci/travis/travis.sh + + export TRAVIS_PULL_REQUEST="" && export GOAL="releasenotes-gen" && ./.ci/travis/travis.sh \ No newline at end of file diff --git a/.ci/travis/travis.sh b/.ci/travis/travis.sh index c5ddebc4a..2069fba5a 100755 --- a/.ci/travis/travis.sh +++ b/.ci/travis/travis.sh @@ -1,11 +1,11 @@ #!/bin/bash -set -e +set -ex case "$GOAL" in -verify) - mvn verify +releasenotes-gen) + .ci/travis/xtr_releasenotes-gen.sh ;; all-sevntu-checks) diff --git a/.ci/travis/xtr_releasenotes-gen.sh b/.ci/travis/xtr_releasenotes-gen.sh new file mode 100755 index 000000000..bb9e7bf54 --- /dev/null +++ b/.ci/travis/xtr_releasenotes-gen.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -ex + +if [[ $TRAVIS_PULL_REQUEST =~ ^([0-9]*)$ ]]; then exit 0; fi +git clone https://github.com/checkstyle/contribution +cd contribution/releasenotes-builder +mvn clean compile package +cd ../../ +git clone https://github.com/checkstyle/checkstyle +cd checkstyle +LATEST_RELEASE_TAG=$(git describe $(git rev-list --tags --max-count=1)) +cd ../ +CS_RELEASE_VERSION=$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | sed 's/-SNAPSHOT//' ) +echo LATEST_RELEASE_TAG=$LATEST_RELEASE_TAG +echo CS_RELEASE_VERSION=$CS_RELEASE_VERSION +java -jar contribution/releasenotes-builder/target/releasenotes-builder-1.0-all.jar \ + -localRepoPath checkstyle -startRef $LATEST_RELEASE_TAG -releaseNumber $CS_RELEASE_VERSION \ + -githubAuthToken $GITHUB_AUTH_TOKEN -generateAll -publishXdoc + +echo ============================================== +echo xdoc +echo +cat xdoc.xml +echo twitter post +echo +cat twitter.txt +echo google plus post +echo +cat gplus.txt +echo RSS post +echo +cat rss.txt +echo mailing list post +echo +cat mailing_list.txt +cd checkstyle/src/xdocs +echo releasenotes.xml after commit +echo +head -n 100 releasenotes.xml diff --git a/.travis.yml b/.travis.yml index 737ea37f3..d9945b3a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -271,23 +271,8 @@ matrix: - jdk: oraclejdk8 env: - DESC="Releasenotes generation" - - CMD0="if [[ $TRAVIS_PULL_REQUEST =~ ^([0-9]*)$ ]]; then exit 0; fi " - - CMD1=" && git clone https://github.com/checkstyle/contribution && cd contribution/releasenotes-builder " - - CMD2=" && mvn clean compile package " - - CMD3=" && cd ../../ && git clone https://github.com/checkstyle/checkstyle && cd checkstyle " - - CMD4=" && LATEST_RELEASE_TAG=\$(git describe \$(git rev-list --tags --max-count=1)) && cd ../" - - CMD5=" && CS_RELEASE_VERSION=$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec | sed 's/-SNAPSHOT//' ) " - - CMD6=" && echo LATEST_RELEASE_TAG=\$LATEST_RELEASE_TAG && echo CS_RELEASE_VERSION=\$CS_RELEASE_VERSION " - - CMD7=" && java -jar contribution/releasenotes-builder/target/releasenotes-builder-1.0-all.jar " - - CMD8=" -localRepoPath checkstyle -startRef \$LATEST_RELEASE_TAG -releaseNumber \$CS_RELEASE_VERSION -githubAuthToken $GITHUB_AUTH_TOKEN -generateAll -publishXdoc" - - CMD9=" && echo && echo ==============================================" - - CMD10=" && echo xdoc && echo && cat xdoc.xml" - - CMD11=" && echo twitter post && echo && cat twitter.txt" - - CMD12=" && echo google plus post && echo && cat gplus.txt" - - CMD13=" && echo RSS post && echo && cat rss.txt" - - CMD14=" && echo mailing list post && echo && cat mailing_list.txt" - - CMD15=" && cd checkstyle/src/xdocs && echo releasenotes.xml after commit && echo && head -n 100 releasenotes.xml" - - CMD=$CMD0$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9$CMD10$CMD9$CMD11$CMD9$CMD12$CMD9$CMD13$CMD9$CMD14$CMD9$CMD15 + - GOAL="releasenotes-gen" + - CMD="./.ci/travis/travis.sh" - COVERAGE_CMD="" # testing of PR format