diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e8d9be26..405f8e6c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,9 +25,9 @@ jobs: name: verify no code was generated command: | if [[ -z $(git status --porcelain) ]]; then - echo "clean" + echo "Git directory is clean." else - echo "dirty" + echo "Git is dirty. Run `make fmtcheck` and `make generate` locally and commit any formatting fixes or generated code." git status --porcelain exit 1 fi diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e376badc3..000000000 --- a/.travis.yml +++ /dev/null @@ -1,62 +0,0 @@ -dist: trusty -sudo: required -services: - - docker -language: go -go: -- "1.14" - -# add TF_CONSUL_TEST=1 to run consul tests -# they were causing timouts in travis -# add TF_ETCDV3_TEST=1 to run etcdv3 tests -# if added, TF_ETCDV3_ENDPOINTS must be set to a comma-separated list of (insecure) etcd endpoints against which to test -env: - - CONSUL_VERSION=0.7.5 GOMAXPROCS=4 GO111MODULE=on GOPROXY=https://proxy.golang.org/ - -# Fetch consul for the backend and provider tests -before_install: - - curl -sLo consul.zip https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip - - unzip consul.zip - - mkdir -p ~/bin - - mv consul ~/bin - - export PATH="~/bin:$PATH" - -install: -# This script is used by the Travis build to install a cookie for -# go.googlesource.com so rate limits are higher when using `go get` to fetch -# packages that live there. -# See: https://github.com/golang/go/issues/12933 -- bash scripts/gogetcookie.sh -- make tools - -before_script: -- git config --global url.https://github.com/.insteadOf ssh://git@github.com/ - -script: -- make fmtcheck generate -- make test -# - bash scripts/travis.sh -- go mod verify -- make e2etest -- GOOS=windows go build -mod=vendor -# website-test is temporarily disabled while we get the website build back in shape after the v0.12 reorganization -#- make website-test - -after_success: - - bash <(curl -s https://codecov.io/bash) - -branches: - only: - - master - - v0.11 - - v0.12 -notifications: - irc: - channels: - - irc.freenode.org#terraform-tool - skip_join: true - use_notice: true -matrix: - fast_finish: true - allow_failures: - - go: tip diff --git a/scripts/travis.sh b/scripts/travis.sh deleted file mode 100755 index dba7d036b..000000000 --- a/scripts/travis.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e -echo "" > coverage.txt - -for d in $(go list ./... | grep -v vendor); do - go test -mod=vendor -timeout=2m -parallel=4 -coverprofile=profile.out -covermode=atomic $d - if [ -f profile.out ]; then - cat profile.out >> coverage.txt - rm profile.out - fi -done