diff --git a/.gitignore b/.gitignore index 730f39c..e0b2c51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .gradle -*/build +build/ .DS_Store .idea spark-warehouse @@ -7,4 +7,4 @@ spark-warehouse *.iml *.iws -isolation-forest/bin \ No newline at end of file +isolation-forest/bin diff --git a/.travis.yml b/.travis.yml index 9e74d28..046de59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,32 @@ jdk: jobs: include: - scala: 2.11.8 - env: SPARK_VERSION=2.3.0 PERFORM_RELEASE=true # Only one build should have PERFORM_RELEASE=true. + env: SPARK_VERSION=2.3.0 + script: ./gradlew build -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION; - scala: 2.11.8 - env: SPARK_VERSION=2.4.3 PERFORM_RELEASE=false + env: SPARK_VERSION=2.4.3 + script: ./gradlew build -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION; - scala: 2.12.11 - env: SPARK_VERSION=2.4.3 PERFORM_RELEASE=false + env: SPARK_VERSION=2.4.3 + script: ./gradlew build -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION; + - stage: upload + scala: 2.11.8 + env: SPARK_VERSION=2.3.0 + script: ./gradlew bintrayUpload -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION + if: (branch = master) AND NOT (type = pull_request) + - scala: 2.11.8 + env: SPARK_VERSION=2.4.3 + script: ./gradlew bintrayUpload -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION + if: (branch = master) AND NOT (type = pull_request) + - scala: 2.12.11 + env: SPARK_VERSION=2.4.3 + script: ./gradlew bintrayUpload -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION + if: (branch = master) AND NOT (type = pull_request) + - stage: release + scala: 2.11.8 + env: SPARK_VERSION=2.3.0 + script: ./gradlew build -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION && ./gradlew ciPerformRelease; + if: (branch = master) AND NOT (type = pull_request) # Skipping install step to avoid having Travis run arbitrary './gradlew assemble' task # https://docs.travis-ci.com/user/customizing-the-build/#Skipping-the-Installation-Step @@ -25,15 +46,4 @@ install: # Don't build tags branches: except: - - /^v\d/ - -# Build and perform release (if needed). -# Currently, only one build is released using Shipkit. Once Shipkit supports releasing multiple builds under the same -# version, we will automatically publish the artifacts from all builds. -# https://github.com/mockito/shipkit/issues/858 -script: - - if [ $PERFORM_RELEASE == true ]; then - ./gradlew build -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION && ./gradlew ciPerformRelease; - else - ./gradlew build -s -PscalaVersion=$TRAVIS_SCALA_VERSION -PsparkVersion=$SPARK_VERSION; - fi + - /^v\d/ diff --git a/build/shipkit/all-contributors.json b/build/shipkit/all-contributors.json deleted file mode 100644 index 48df9c7..0000000 --- a/build/shipkit/all-contributors.json +++ /dev/null @@ -1 +0,0 @@ -[{ "name": "James Verbus", "login": "jverbus", "profileUrl": "https:\/\/github.com\/jverbus", "numberOfContributions": "1" }] \ No newline at end of file