diff --git a/.buildkite/pipeline.exec.sh b/.buildkite/pipeline.exec.sh index 3b2324c..f19beb1 100755 --- a/.buildkite/pipeline.exec.sh +++ b/.buildkite/pipeline.exec.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +set -o errexit +set -o errtrace +set -o nounset +set -o pipefail + git config --global user.email "team@getnelson.io" git config --global user.name "Nelson Team" @@ -7,12 +12,12 @@ git config --global user.name "Nelson Team" export TRAVIS="true" # way hacky export TRAVIS_COMMIT="$BUILDKITE_COMMIT" export TRAVIS_REPO_SLUG="getnelson/knobs" -export TRAVIS_JOB_NUMBER="1.1" export TRAVIS_BUILD_NUMBER="$BUILDKITE_BUILD_NUMBER" export KNOBS_TEST_DIR="knobs-test" -if [ "$BUILDKITE_PULL_REQUEST" = 'false' ]; then +if [ "${BUILDKITE_PULL_REQUEST:-}" = 'false' ]; then git checkout -qf "$BUILDKITE_BRANCH"; fi -sbt ++2.11.11 'release with-defaults' +echo "--> running build for ${TRAVIS_SCALA_VERSION}..." +eval "sbt ++${TRAVIS_SCALA_VERSION} 'release with-defaults'" diff --git a/.buildkite/pipeline.teardown.sh b/.buildkite/pipeline.teardown.sh index 1ec4958..9ec7e43 100755 --- a/.buildkite/pipeline.teardown.sh +++ b/.buildkite/pipeline.teardown.sh @@ -4,4 +4,4 @@ echo "==>> initilizing doctl..." doctl auth init -t "${DIGITAL_OCEAN_API_TOKEN}" echo "==>> deleting the droplet..." -doctl compute droplet delete -f buildkite-worker +doctl compute droplet list | grep -v 'ID' | sort -r -k1 | grep "buildkite-worker" | awk '{print $1}' | xargs -L1 doctl compute droplet delete -f diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index af36b43..26837b4 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,12 +2,23 @@ steps: - label: ":hammer: build" command: .buildkite/pipeline.exec.sh - concurrency: 1 - concurrency_group: primary timeout_in_minutes: 45 branches: master env: - - BUILDKITE_CLEAN_CHECKOUT: true + BUILDKITE_CLEAN_CHECKOUT: true + TRAVIS_SCALA_VERSION: "2.11.12" + TRAVIS_JOB_NUMBER: "1.1" + agents: + os: linux + + - label: ":hammer: build" + command: .buildkite/pipeline.exec.sh + timeout_in_minutes: 45 + branches: master + env: + BUILDKITE_CLEAN_CHECKOUT: true + TRAVIS_SCALA_VERSION: "2.12.4" + TRAVIS_JOB_NUMBER: "1.2" agents: os: linux diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1ecdc9f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,48 +0,0 @@ -language: scala - -matrix: - include: - # scala 2.11 - - jdk: oraclejdk8 - scala: 2.11.12 - # scala 2.12 - - jdk: oraclejdk8 - scala: 2.12.4 - -branches: - only: - - master - -before_script: - - "if [ $TRAVIS_PULL_REQUEST = 'false' ]; then git checkout -qf $TRAVIS_BRANCH; fi" - -script: - - | - if [ $TRAVIS_PULL_REQUEST = 'false' ]; then - if [ $RELEASE_ON_PUSH = 'false' ]; then - sbt ++$TRAVIS_SCALA_VERSION test coverageReport - else - sbt ++$TRAVIS_SCALA_VERSION 'release with-defaults' - fi - else - sbt ++$TRAVIS_SCALA_VERSION test coverageReport - fi - - find $HOME/.sbt -name "*.lock" | xargs rm - - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm - -cache: - directories: - - $HOME/.ivy2/cache - - $HOME/.sbt/boot/scala-$TRAVIS_SCALA_VERSION - -after_success: - - find $HOME/.sbt -name "*.lock" | xargs rm - - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm - - "bash <(curl -s https://codecov.io/bash) -r $TRAVIS_REPO_SLUG -t $CODECOV_TOKEN" - -env: - global: - - secure: "emCycBlDj0nwdK/SI4q/38WGlZS1tvttZbgzb38KegPUIOv6hr78L73t/2pb8FT/AHPdhYF4q6q8AXxAJi3QoiznMSAT1xyxZZ+wWrWqPuphhkqMSEdzcG8fbi3YGkB0sl+7ZLsveUg/JmG6j6NFjzWjRjb6Rn9MUWKGWDs5a8g=" - - secure: "RKDMtxH135S+urp/t92qAwe1L0oGDuheKSXBcjwU55v2OS1NX4GPzE64y9hCuYK43BkXB1Xv/mMnF55TYSjHHpnP4BUXW0/SIERrwM+JFQ1TiukocMNiRUZ0jzZ6sUl7wpwhDntXR//jb/6+gCxC7hdlYUQgQ6qjCQffBZT0RzY=" - - secure: "lqLNd52nASivxq6IFYsq7UIBbH2eHVcvqSbOGFkzDsWscBoeWl5BvM1uOGFRoU3kJB3L23tK3Dq8rfIMXUh6ghPQpMlLKNtQ1XiTIm0s5MqY4JqmRbSLb6eexof/sUE6CgtwTlYp6LTQzT0NLdlBsvyySq5EkfJqeMVH0K7uu5Y=" - - KNOBS_TEST_DIR="knobs-test"