diff options
| -rwxr-xr-x | cix.sh | 3 | ||||
| -rwxr-xr-x | travis.sh | 10 |
2 files changed, 12 insertions, 1 deletions
@@ -17,6 +17,9 @@ case "$RUN_ACTIVITY" in if [[ "$GITHUB_BRANCH" == "PULLREQUEST-"* ]] && [[ "$DB_ENGINE" != "postgresql93" ]]; then # execute PR QA only on postgres exit 0 + elif [[ "$GITHUB_BRANCH" == "dogfood-on-next" ]] && [[ "$DB_ENGINE" != "postgresql93" ]]; then + # execute dogfood QA only on postgres + exit 0 else mvn clean package -B -e -V -f tests/plugins/pom.xml diff --git a/travis.sh b/travis.sh index 7145df65bb8..27f69783431 100755 --- a/travis.sh +++ b/travis.sh @@ -169,7 +169,7 @@ BUILD) -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \ -Dsonar.analysis.sha1=$TRAVIS_COMMIT \ -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG - + elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN:-}" ]; then echo 'Build and analyze internal pull request' @@ -192,6 +192,14 @@ BUILD) -Dsonar.pullrequest.id=$TRAVIS_PULL_REQUEST \ -Dsonar.pullrequest.github.id=$TRAVIS_PULL_REQUEST \ -Dsonar.pullrequest.github.repository=$TRAVIS_REPO_SLUG + + elif [[ "$TRAVIS_BRANCH" == "dogfood-on-next" ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + echo 'Build dogfood branch' + + mvn org.jacoco:jacoco-maven-plugin:prepare-agent deploy \ + $MAVEN_ARGS \ + -Pdeploy-sonarsource,release + else echo 'Build feature branch or external pull request' |