From 7135abad8e1daa80354caba27801e7592d0c51de Mon Sep 17 00:00:00 2001 From: Evan Vigil-McClanahan Date: Thu, 20 Dec 2018 10:07:26 -0800 Subject: [PATCH 1/5] circle changes --- .travis.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 70e5541..0000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -language: erlang -matrix: - include: - - os: linux - otp_release: 20.0 -script: - - "rebar3 do xref, ct, dialyzer" -branches: - only: - - master -cache: - directories: - - "$HOME/.cache/rebar3/hex/default" From 28cfd3cb54f1003f41d803fcc8d585df62bcf2c4 Mon Sep 17 00:00:00 2001 From: Evan Vigil-McClanahan Date: Thu, 20 Dec 2018 10:15:58 -0800 Subject: [PATCH 2/5] change badge --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index d1e97c0..75a8087 100644 --- a/README.org +++ b/README.org @@ -1,6 +1,6 @@ #+TITLE: VRRM: just enough consensus -[[https://travis-ci.org/evanmcc/vrrm.svg?branch=master]] +[![CircleCI](https://circleci.com/gh/evanmcc/vrrm.svg?style=svg)](https://circleci.com/gh/evanmcc/vrrm) * DISCLAIMER calling this research quality code is an insult to research quality From d00e57922ba84202f6a8007ff18a438c87998558 Mon Sep 17 00:00:00 2001 From: Evan Vigil-McClanahan Date: Thu, 20 Dec 2018 10:18:43 -0800 Subject: [PATCH 3/5] actually add config --- .circleci/config.yml | 66 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..e885aa7 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,66 @@ +version: 2.1 + +orbs: + rebar3: tsloughter/rebar3@0.5.1 + +commands: + upload: + parameters: + token: + description: The API token to use for uploading to Codecov. + type: string + default: $CODECOV_TOKEN + path: + description: Path to the code coverage data file to upload. + type: string + steps: + - run: + name: Upload Coverage Results + command: | + apk add --no-cache curl + curl --request POST --retry 3 --silent --show-error --fail \ + --data-binary @<< parameters.path >> \ + "https://codecov.io/upload/v2?service=circleci\ + &token=<< parameters.token >>\ + &commit=$CIRCLE_SHA1\ + &branch=$CIRCLE_BRANCH\ + &build=$CIRCLE_BUILD_NUM\ + &job=$CIRCLE_NODE_INDEX\ + &build_url=$CIRCLE_BUILD_URL\ + &slug=$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME\ + &pr=$CIRCLE_PR_NUMBER" +jobs: + codecov: + executor: rebar3/erlang + steps: + - rebar3/install_ca_certs + - checkout + - attach_workspace: + at: ~/project/ + - run: + command: | + rebar3 covertool generate + - upload: + path: ~/project/_build/test/covertool/grpcbox.covertool.xml + +workflows: + version: 2.1 + build_and_test: + jobs: + - rebar3/compile + - rebar3/xref: + requires: + - rebar3/compile + - rebar3/dialyzer: + requires: + - rebar3/compile + - rebar3/ct: + requires: + - rebar3/compile + - rebar3/cover: + requires: + - rebar3/ct + - codecov: + requires: +- rebar3/cover + From 766804c9b2d9d1176fdd51b8558098bea03f5671 Mon Sep 17 00:00:00 2001 From: Evan Vigil-McClanahan Date: Thu, 20 Dec 2018 10:20:55 -0800 Subject: [PATCH 4/5] remove codecov stuff --- .circleci/config.yml | 82 ++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e885aa7..35d49fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,43 +5,43 @@ orbs: commands: upload: - parameters: - token: - description: The API token to use for uploading to Codecov. - type: string - default: $CODECOV_TOKEN - path: - description: Path to the code coverage data file to upload. - type: string - steps: - - run: - name: Upload Coverage Results - command: | - apk add --no-cache curl - curl --request POST --retry 3 --silent --show-error --fail \ - --data-binary @<< parameters.path >> \ - "https://codecov.io/upload/v2?service=circleci\ - &token=<< parameters.token >>\ - &commit=$CIRCLE_SHA1\ - &branch=$CIRCLE_BRANCH\ - &build=$CIRCLE_BUILD_NUM\ - &job=$CIRCLE_NODE_INDEX\ - &build_url=$CIRCLE_BUILD_URL\ - &slug=$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME\ - &pr=$CIRCLE_PR_NUMBER" + # parameters: + # token: + # description: The API token to use for uploading to Codecov. + # type: string + # default: $CODECOV_TOKEN + # path: + # description: Path to the code coverage data file to upload. + # type: string + # steps: + # - run: + # name: Upload Coverage Results + # command: | + # apk add --no-cache curl + # curl --request POST --retry 3 --silent --show-error --fail \ + # --data-binary @<< parameters.path >> \ + # "https://codecov.io/upload/v2?service=circleci\ + # &token=<< parameters.token >>\ + # &commit=$CIRCLE_SHA1\ + # &branch=$CIRCLE_BRANCH\ + # &build=$CIRCLE_BUILD_NUM\ + # &job=$CIRCLE_NODE_INDEX\ + # &build_url=$CIRCLE_BUILD_URL\ + # &slug=$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME\ + # &pr=$CIRCLE_PR_NUMBER" jobs: codecov: - executor: rebar3/erlang - steps: - - rebar3/install_ca_certs - - checkout - - attach_workspace: - at: ~/project/ - - run: - command: | - rebar3 covertool generate - - upload: - path: ~/project/_build/test/covertool/grpcbox.covertool.xml + # executor: rebar3/erlang + # steps: + # - rebar3/install_ca_certs + # - checkout + # - attach_workspace: + # at: ~/project/ + # - run: + # command: | + # rebar3 covertool generate + # - upload: + # path: ~/project/_build/test/covertool/grpcbox.covertool.xml workflows: version: 2.1 @@ -57,10 +57,10 @@ workflows: - rebar3/ct: requires: - rebar3/compile - - rebar3/cover: - requires: - - rebar3/ct - - codecov: - requires: -- rebar3/cover +# - rebar3/cover: +# requires: +# - rebar3/ct +# - codecov: +# requires: +# - rebar3/cover From 287e82457924b48cbe4167c5d6023a28c6177655 Mon Sep 17 00:00:00 2001 From: Evan Vigil-McClanahan Date: Thu, 20 Dec 2018 10:29:23 -0800 Subject: [PATCH 5/5] remove more codecov stuff --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35d49fc..dbe0a12 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,8 +29,8 @@ commands: # &build_url=$CIRCLE_BUILD_URL\ # &slug=$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME\ # &pr=$CIRCLE_PR_NUMBER" -jobs: - codecov: +# jobs: +# codecov: # executor: rebar3/erlang # steps: # - rebar3/install_ca_certs