diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5219a17a7b..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -sudo: required -dist: trusty - -addons: - apt: - sources: - - google-chrome - packages: - - google-chrome-stable - -language: go - -services: - - docker - -go: - - "1.12" - -go_import_path: github.com/hashicorp/vault - -matrix: - allow_failures: - - go: tip - -cache: - directories: - - ui/node_modules - -before_install: - - nvm install 10 - - nvm use 10 - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.12.1 - - export PATH="$HOME/.yarn/bin:$PATH" - -branches: - only: - - master - - travis-testing - -env: - - TEST_COMMAND='make dev test-ember' - - TEST_COMMAND='make dev test-ui-browserstack' - - TEST_COMMAND='travis_wait 75 make testtravis' - - TEST_COMMAND='travis_wait 75 make testracetravis' - - GO111MODULE=on - -script: - - make bootstrap - - eval $TEST_COMMAND diff --git a/Makefile b/Makefile index c4817b9629..9cfd572f4d 100644 --- a/Makefile +++ b/Makefile @@ -48,12 +48,6 @@ dev-ui-mem: assetcheck dev-ui dev-dynamic-mem: BUILD_TAGS+=memprofiler dev-dynamic-mem: dev-dynamic -testtravis: BUILD_TAGS+=travis -testtravis: test - -testracetravis: BUILD_TAGS+=travis -testracetravis: testrace - # test runs the unit tests and vets the code test: prep @CGO_ENABLED=$(CGO_ENABLED) \ diff --git a/README.md b/README.md index ecddc43505..8d23a77cef 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Vault [![Build Status](https://travis-ci.org/hashicorp/vault.svg)](https://travis-ci.org/hashicorp/vault) [![Join the chat at https://gitter.im/hashicorp-vault/Lobby](https://badges.gitter.im/hashicorp-vault/Lobby.svg)](https://gitter.im/hashicorp-vault/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![vault enterprise](https://img.shields.io/badge/vault-enterprise-yellow.svg?colorB=7c8797&colorA=000000)](https://www.hashicorp.com/products/vault/?utm_source=github&utm_medium=banner&utm_campaign=github-vault-enterprise) +# Vault [![CircleCI](https://circleci.com/gh/hashicorp/vault.svg?style=svg)](https://circleci.com/gh/hashicorp/vault) [![Join the chat at https://gitter.im/hashicorp-vault/Lobby](https://badges.gitter.im/hashicorp-vault/Lobby.svg)](https://gitter.im/hashicorp-vault/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![vault enterprise](https://img.shields.io/badge/vault-enterprise-yellow.svg?colorB=7c8797&colorA=000000)](https://www.hashicorp.com/products/vault/?utm_source=github&utm_medium=banner&utm_campaign=github-vault-enterprise) ---- diff --git a/builtin/credential/ldap/backend_test.go b/builtin/credential/ldap/backend_test.go index fd5104546a..1aa3035068 100644 --- a/builtin/credential/ldap/backend_test.go +++ b/builtin/credential/ldap/backend_test.go @@ -1,5 +1,3 @@ -// +build !travis - package ldap import ( diff --git a/sdk/helper/keysutil/policy_test.go b/sdk/helper/keysutil/policy_test.go index 79b50a3c14..25ac69d3b9 100644 --- a/sdk/helper/keysutil/policy_test.go +++ b/sdk/helper/keysutil/policy_test.go @@ -405,7 +405,6 @@ func checkKeys(t *testing.T, for i := p.MinDecryptionVersion; i <= p.LatestVersion; i++ { ver := strconv.Itoa(i) - // Travis has weird time zone issues and gets super unhappy if !p.Keys[ver].CreationTime.Equal(keysArchive[i].CreationTime) { t.Fatalf("key %d not equivalent between policy keys and test keys archive; policy keys:\n%#v\ntest keys archive:\n%#v\n", i, p.Keys[ver], keysArchive[i]) } diff --git a/ui/scripts/run-browserstack-tests.js b/ui/scripts/run-browserstack-tests.js index cdeda6f3af..eb5708e910 100644 --- a/ui/scripts/run-browserstack-tests.js +++ b/ui/scripts/run-browserstack-tests.js @@ -24,7 +24,7 @@ function run(command, args = []) { console.log('success'); process.exit(0); } finally { - if (process.env.TRAVIS_JOB_NUMBER) { + if (process.env.CI === 'true') { await run('ember', ['browserstack:results']); } await run('ember', ['browserstack:disconnect']);