Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into f-template-followups
Browse files Browse the repository at this point in the history
* origin/master: (90 commits)
  Port OSS changes from perf standby fix (#7818)
  Clarify language around 472 (#7814)
  Revert change suggested by vet. See the comment for details. (#7815)
  Document secondary activation public key endpoints/params (#7810)
  debug: check for nil secret on replication status response before accessing secret.Data (#7811)
  Update Azure storage docs (#7808)
  changelog++
  ci: switch to go1.12.12 on machine executors (#7703)
  website: Homepage updates, use case pages, navigation changes (#7782)
  Help text: update token create help about id value (#7792)
  changelog++
  changelog++
  Update API to use lease_id in body of sys/leases/revoke call (#7777)
  changelog++
  Don't allow registering a non-root zero TTL token lease (#7524)
  Update go-metrics (#7794)
  Update go-metrics in sdk (#7795)
  doc: remove comma from list.html.md (#7766)
  Update azure secrets plugin (#7788)
  Update helm.html.md (#7310)
  ...
  • Loading branch information
catsby committed Nov 6, 2019
2 parents 0c8f648 + aca342f commit f330ca3
Show file tree
Hide file tree
Showing 403 changed files with 172,833 additions and 14,388 deletions.
237 changes: 109 additions & 128 deletions .circleci/config.yml

Large diffs are not rendered by default.

38 changes: 16 additions & 22 deletions .circleci/config/@config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ version: 2.1

references:
images:
go: &GOLANG_IMAGE golang:1.12.12-buster # Pin Go to patch version (ex: 1.2.3)
node: &NODE_IMAGE node:10-buster # Pin Node.js to major version (ex: 10)

cache:
go-sum: &GO_SUM_CACHE_KEY go-sum-v1-{{ checksum "go.sum" }}
yarn-lock: &YARN_LOCK_CACHE_KEY yarn-lock-v1-{{ checksum "ui/yarn.lock" }}
yarn-lock: &YARN_LOCK_CACHE_KEY yarn-lock-v6-{{ checksum "ui/yarn.lock" }}

# more commands defined in commands/
commands:
Expand All @@ -22,35 +21,30 @@ commands:
key: *YARN_LOCK_CACHE_KEY
paths:
- ui/node_modules
restore_go_cache:
steps:
- restore_cache:
key: *GO_SUM_CACHE_KEY
save_go_cache:
steps:
- save_cache:
key: *GO_SUM_CACHE_KEY
paths:
- /go/pkg/mod

executors:
go:
docker:
- image: *GOLANG_IMAGE
shell: /usr/bin/env bash -euo pipefail -c
working_directory: /src
go-machine:
machine: true
shell: /usr/bin/env bash -euo pipefail -c
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.12.12 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.3.3 # Pin gotestsum to patch version (ex: 1.2.3)
GO_TAGS:
shell: /usr/bin/env bash -euo pipefail -c
working_directory: ~/src
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
node:
docker:
- image: *NODE_IMAGE
shell: /usr/bin/env bash -euo pipefail -c
working_directory: /src

working_directory: /go/src/github.com/hashicorp/vault
python:
docker:
- image: python:3-alpine
shell: /usr/bin/env bash -euo pipefail -c
working_directory: /go/src/github.com/hashicorp/vault
alpine:
docker:
- image: alpine:3.10.2
shell: /bin/sh
working_directory: /go/src/github.com/hashicorp/vault
8 changes: 0 additions & 8 deletions .circleci/config/commands/go_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ steps:
command: |
set -x
# Install Go
curl -sSLO "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz"
sudo rm -rf /usr/local/go
sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
export GOPATH=/go
export PATH="${PATH}:${GOPATH}/bin:/usr/local/go/bin"
# Install CircleCI CLI
curl -sSL \
"https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CIRCLECI_CLI_VERSION}/circleci-cli_${CIRCLECI_CLI_VERSION}_linux_amd64.tar.gz" \
Expand Down
21 changes: 21 additions & 0 deletions .circleci/config/commands/setup-go.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
description: >
Ensure the right version of Go is installed and set GOPATH to $HOME/go.
steps:
- run:
working_directory: ~/
name: Setup Go
command: |
[ -n "$GO_VERSION" ] || { echo "You must set GO_VERSION"; exit 1; }
# Install Go
curl -sSLO "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz"
sudo rm -rf /usr/local/go
sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
GOPATH="/go"
mkdir $GOPATH 2>/dev/null || { sudo mkdir $GOPATH && sudo chmod 777 $GOPATH; }
echo "export GOPATH='$GOPATH'" >> "$BASH_ENV"
echo "export PATH='$PATH:$GOPATH/bin:/usr/local/go/bin'" >> "$BASH_ENV"
echo "$ go version"
go version
4 changes: 2 additions & 2 deletions .circleci/config/jobs/build-go-dev.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
executor: go
executor: go-machine
steps:
- setup-go
- checkout
- restore_go_cache
- attach_workspace:
at: .
- run:
Expand Down
15 changes: 0 additions & 15 deletions .circleci/config/jobs/go-mod-download.yml

This file was deleted.

7 changes: 1 addition & 6 deletions .circleci/config/jobs/test-go-race.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
executor: go-machine
steps:
- setup-go
- checkout
- run:
name: Allow circleci user to restore Go modules cache
command: |
sudo mkdir /go
sudo chown -R circleci:circleci /go
- restore_go_cache
- go_test:
extra_flags: "-race"
- store_artifacts:
Expand Down
7 changes: 1 addition & 6 deletions .circleci/config/jobs/test-go.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
executor: go-machine
parallelism: 2
steps:
- setup-go
- checkout
- run:
name: Allow circleci user to restore Go modules cache
command: |
sudo mkdir /go
sudo chown -R circleci:circleci /go
- restore_go_cache
- go_test
- store_artifacts:
path: test-results
Expand Down
5 changes: 1 addition & 4 deletions .circleci/config/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ jobs:
- install-ui-dependencies:
requires:
- pre-flight-checks
- go-mod-download:
requires:
- pre-flight-checks
- build-go-dev:
requires:
- go-mod-download
- pre-flight-checks
- test-ui:
requires:
- install-ui-dependencies
Expand Down
Loading

0 comments on commit f330ca3

Please sign in to comment.