Skip to content

Commit

Permalink
backport of commit c6f67ab
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonodonnell committed Mar 14, 2022
1 parent f983879 commit 03d9942
Show file tree
Hide file tree
Showing 1,999 changed files with 21,049 additions and 63,264 deletions.
102 changes: 29 additions & 73 deletions .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions .circleci/config/commands/go_test.yml
Expand Up @@ -38,7 +38,7 @@ steps:
environment:
GOPRIVATE: 'github.com/hashicorp/*'
command: |
set -exo pipefail
set -x
EXTRA_TAGS=
case "<< parameters.extra_flags >>" in
Expand All @@ -65,21 +65,21 @@ steps:
for dir in "${modules[@]}"
do
pushd "$dir"
# On its own line so that -e will fail the tests if we detect errors here.
go list -test -json ./... > test-list.json
# Split Go tests by prior test times. If use_docker is true, only run
# tests that depend on docker, otherwise only those that don't.
# The appended true condition ensures the command will succeed if no packages are found
if [ $USE_DOCKER == 1 ]; then
package_names=$(< test-list.json jq -r 'select(.Deps != null) |
package_names=$(go list -test -json ./... |
jq -r 'select(.Deps != null) |
select(any(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker"))) |
.ForTest | select(. != null)' |
sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true)
sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true
else
package_names=$(< test-list.json jq -r 'select(.Deps != null) |
package_names=$(go list -test -json ./... |
jq -r 'select(.Deps != null) |
select(all(.Deps[] ; contains("github.com/hashicorp/vault/helper/testhelpers/docker")|not)) |
.ForTest | select(. != null)' |
sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname || true)
sort -u | grep -v vault/integ | circleci tests split --split-by=timings --timings-type=classname) || true
fi
# Move back into root directory
popd
Expand Down
1 change: 0 additions & 1 deletion .circleci/config/executors/@executors.yml
Expand Up @@ -5,7 +5,6 @@ go-machine:
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.17.7 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
GOFUMPT_VERSION: 0.2.1 # Pin gofumpt to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /home/circleci/go/src/github.com/hashicorp/vault
node:
Expand Down
3 changes: 1 addition & 2 deletions .circleci/config/jobs/algolia-index.yml
@@ -1,5 +1,5 @@
docker:
- image: node:14
- image: node:12
steps:
- checkout
- run:
Expand All @@ -10,6 +10,5 @@ steps:
exit 0
fi
cd website/
npm install -g npm@latest
npm install
node scripts/index_search_content.js
16 changes: 0 additions & 16 deletions .circleci/config/jobs/fmt.yml

This file was deleted.

1 change: 0 additions & 1 deletion .circleci/config/workflows/ci.yml
@@ -1,6 +1,5 @@
jobs:
- pre-flight-checks
- fmt
- install-ui-dependencies:
requires:
- pre-flight-checks
Expand Down
46 changes: 0 additions & 46 deletions .github/workflows/backport-docs.yml

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/backport.yml

This file was deleted.

0 comments on commit 03d9942

Please sign in to comment.