From e3b59cecc063bb3b9df03c54fa3a1e62c6625ef8 Mon Sep 17 00:00:00 2001 From: Adelbert Chang Date: Sat, 22 Dec 2018 20:15:17 -0800 Subject: [PATCH 1/4] bump-cats-versions --- core/build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build.sbt b/core/build.sbt index a87157e..fc55c19 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -1,8 +1,8 @@ libraryDependencies ++= Seq( "io.argonaut" %% "argonaut" % "6.2.1", - "org.typelevel" %% "cats-free" % "1.1.0", - "org.typelevel" %% "cats-effect" % "0.10" + "org.typelevel" %% "cats-free" % "1.5.0", + "org.typelevel" %% "cats-effect" % "1.1.0" ) addCompilerPlugin("org.spire-math" % "kind-projector" % "0.9.5" cross CrossVersion.binary) From f1102a37a731a950d5bab278f197160a285ff191 Mon Sep 17 00:00:00 2001 From: Adelbert Chang Date: Sat, 22 Dec 2018 20:15:44 -0800 Subject: [PATCH 2/4] bump version to 5.y.z --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 0f7fe00..cbf330b 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "4.0.0-SNAPSHOT" +version in ThisBuild := "5.0.0-SNAPSHOT" From 21a7db2f3fd89013a9f3adc9a015a5838cc11af7 Mon Sep 17 00:00:00 2001 From: Adelbert Chang Date: Sat, 22 Dec 2018 21:07:53 -0800 Subject: [PATCH 3/4] try to prep for release? --- .buildkite/pipeline.exec.sh | 23 +++++++++++++++++ .buildkite/pipeline.teardown.sh | 7 +++++ .buildkite/pipeline.yml | 34 +++++++++++++++++++++++++ README.md | 10 ++++---- project.sbt | 3 +-- project/CentralRequirementsPlugin.scala | 8 +++--- 6 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 .buildkite/pipeline.exec.sh create mode 100644 .buildkite/pipeline.teardown.sh create mode 100644 .buildkite/pipeline.yml diff --git a/.buildkite/pipeline.exec.sh b/.buildkite/pipeline.exec.sh new file mode 100644 index 0000000..2ed4fb7 --- /dev/null +++ b/.buildkite/pipeline.exec.sh @@ -0,0 +1,23 @@ +#!/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" + +# subvert the sbt-rig plugin +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" + +if [ "${BUILDKITE_PULL_REQUEST:-}" = 'false' ]; then + git checkout -qf "$BUILDKITE_BRANCH"; +fi + +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 new file mode 100644 index 0000000..9ec7e43 --- /dev/null +++ b/.buildkite/pipeline.teardown.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo "==>> initilizing doctl..." +doctl auth init -t "${DIGITAL_OCEAN_API_TOKEN}" + +echo "==>> deleting the droplet..." +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 new file mode 100644 index 0000000..26837b4 --- /dev/null +++ b/.buildkite/pipeline.yml @@ -0,0 +1,34 @@ +--- +steps: + - label: ":hammer: build" + command: .buildkite/pipeline.exec.sh + timeout_in_minutes: 45 + branches: master + env: + 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 + + - wait: ~ + continue_on_failure: true + + - label: ":radioactive_sign: teardown" + command: .buildkite/pipeline.teardown.sh + branches: master + env: + - BUILDKITE_CLEAN_CHECKOUT: true + agents: + os: linux diff --git a/README.md b/README.md index 8e8245b..4b258f0 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ![Logo](docs/src/img/logo.png) -[![Build Status](https://travis-ci.org/Verizon/helm.svg?branch=master)](https://travis-ci.org/Verizon/helm) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.verizon.helm/core_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.verizon.helm/core_2.11) -[![codecov](https://codecov.io/gh/Verizon/helm/branch/master/graph/badge.svg)](https://codecov.io/gh/Verizon/helm) +[![Build Status](https://travis-ci.org/getnelson/helm.svg?branch=master)](https://travis-ci.org/getnelson/helm) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.getnelson.helm/core_2.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.getnelson.helm/core_2.11) +[![codecov](https://codecov.io/gh/getnelson/helm/branch/master/graph/badge.svg)](https://codecov.io/gh/getnelson/helm) A native [Scala](http://scala-lang.org) client for interacting with [Consul](https://www.consul.io/). There is currently one supported client, which uses [http4s](http://http4s.org) to make HTTP calls to Consul. Alternative implementations could be added with relative ease by providing an additional free interpreter for the `ConsulOp` algebra. @@ -12,9 +12,9 @@ A native [Scala](http://scala-lang.org) client for interacting with [Consul](htt Add the following to your `build.sbt`: - libraryDependencies += "io.verizon.helm" %% "http4s" % "1.4.78-scalaz-7.1" + libraryDependencies += "io.getnelson.helm" %% "http4s" % "x.y.z" -The *Helm* binaries are located on maven central, so no additional resolvers are needed. +Where `x.y.z` is the desired Helm version. Check for the latest release [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.getnelson.helm%22). ### Algebra diff --git a/project.sbt b/project.sbt index 0442ac2..634a487 100644 --- a/project.sbt +++ b/project.sbt @@ -1,5 +1,4 @@ - -organization in Global := "io.verizon.helm" +organization in Global := "io.getnelson.helm" crossScalaVersions in Global := Seq("2.12.4", "2.11.12") diff --git a/project/CentralRequirementsPlugin.scala b/project/CentralRequirementsPlugin.scala index 375bc6e..741b9a7 100644 --- a/project/CentralRequirementsPlugin.scala +++ b/project/CentralRequirementsPlugin.scala @@ -26,7 +26,7 @@ object CentralRequirementsPlugin extends AutoPlugin { override def requires = RigPlugin override lazy val projectSettings = Seq( - sonatypeProfileName := "io.verizon", + sonatypeProfileName := "io.getnelson", pomExtra in Global := { @@ -52,8 +52,8 @@ object CentralRequirementsPlugin extends AutoPlugin { }, licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")), - homepage := Some(url("http://verizon.github.io/helm/")), - scmInfo := Some(ScmInfo(url("https://github.com/verizon/helm"), - "git@github.com:verizon/helm.git")) + homepage := Some(url("http://getnelson.github.io/helm/")), + scmInfo := Some(ScmInfo(url("https://github.com/getnelson/helm"), + "git@github.com:getnelson/helm.git")) ) } From 496d6ece364187ca9e2e4587f1a85c388bea9b40 Mon Sep 17 00:00:00 2001 From: Cory Parent Date: Sat, 22 Dec 2018 21:37:14 -0800 Subject: [PATCH 4/4] Update .buildkite/pipeline.exec.sh Co-Authored-By: adelbertc --- .buildkite/pipeline.exec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.exec.sh b/.buildkite/pipeline.exec.sh index 2ed4fb7..e408f43 100644 --- a/.buildkite/pipeline.exec.sh +++ b/.buildkite/pipeline.exec.sh @@ -11,7 +11,7 @@ git config --global user.name "Nelson Team" # subvert the sbt-rig plugin export TRAVIS="true" # way hacky export TRAVIS_COMMIT="$BUILDKITE_COMMIT" -export TRAVIS_REPO_SLUG="getnelson/knobs" +export TRAVIS_REPO_SLUG="getnelson/helm" export TRAVIS_JOB_NUMBER="1.1" export TRAVIS_BUILD_NUMBER="$BUILDKITE_BUILD_NUMBER"