From 6c80f142f09bf0934c06e78513dba0af04016ebe Mon Sep 17 00:00:00 2001 From: mgritter Date: Mon, 22 Mar 2021 12:16:32 -0700 Subject: [PATCH 1/5] Update version to 1.7 --- sdk/version/version_base.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/version/version_base.go b/sdk/version/version_base.go index 4a04775ec4cb..4c644f4f5734 100644 --- a/sdk/version/version_base.go +++ b/sdk/version/version_base.go @@ -9,6 +9,6 @@ var ( CgoEnabled bool Version = "1.7.0" - VersionPrerelease = "rc2" + VersionPrerelease = "" VersionMetadata = "" ) From 5060bd0819c0c1b68230dcb21297f89f1b1f3e04 Mon Sep 17 00:00:00 2001 From: mgritter Date: Mon, 22 Mar 2021 12:17:02 -0700 Subject: [PATCH 2/5] Go mod vendor. --- vendor/github.com/hashicorp/vault/sdk/version/version_base.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/github.com/hashicorp/vault/sdk/version/version_base.go b/vendor/github.com/hashicorp/vault/sdk/version/version_base.go index 4a04775ec4cb..4c644f4f5734 100644 --- a/vendor/github.com/hashicorp/vault/sdk/version/version_base.go +++ b/vendor/github.com/hashicorp/vault/sdk/version/version_base.go @@ -9,6 +9,6 @@ var ( CgoEnabled bool Version = "1.7.0" - VersionPrerelease = "rc2" + VersionPrerelease = "" VersionMetadata = "" ) From c5c16a0a39ad8b9909c2a15b57c507a6daebf1b4 Mon Sep 17 00:00:00 2001 From: mgritter Date: Mon, 22 Mar 2021 12:21:53 -0700 Subject: [PATCH 3/5] Update go version to 1.15.10 --- .circleci/config.yml | 4 ++-- .circleci/config/executors/@executors.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 73baef458331..d8a99b0f0f68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -685,7 +685,7 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.15.7 + - GO_VERSION: 1.15.10 - GO111MODULE: 'off' - GOTESTSUM_VERSION: 0.5.2 algolia-index: @@ -2021,7 +2021,7 @@ jobs: environment: - CIRCLECI_CLI_VERSION: 0.1.5546 - GO_TAGS: '' - - GO_VERSION: 1.15.7 + - GO_VERSION: 1.15.10 - GO111MODULE: 'off' - GOTESTSUM_VERSION: 0.5.2 test-go-race-remote-docker: diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml index 4bd75db48b8b..e83370606b08 100644 --- a/.circleci/config/executors/@executors.yml +++ b/.circleci/config/executors/@executors.yml @@ -4,7 +4,7 @@ go-machine: environment: GO111MODULE: "off" CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3) - GO_VERSION: 1.15.7 # Pin Go to patch version (ex: 1.2.3) + GO_VERSION: 1.15.10 # Pin Go to patch version (ex: 1.2.3) GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3) GO_TAGS: "" working_directory: /go/src/github.com/hashicorp/vault From 57f6142d9941546f783e11c177c5324b8bd1d31c Mon Sep 17 00:00:00 2001 From: mgritter Date: Mon, 22 Mar 2021 12:25:50 -0700 Subject: [PATCH 4/5] Changelog for go version. --- changelog/11173.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/11173.txt diff --git a/changelog/11173.txt b/changelog/11173.txt new file mode 100644 index 000000000000..2443205cf04c --- /dev/null +++ b/changelog/11173.txt @@ -0,0 +1,3 @@ +```release-note:change +go: Update go version to 1.15.10 +``` From 9b263f49fc68346de3ddf513d8678120e4d2feec Mon Sep 17 00:00:00 2001 From: mgritter Date: Mon, 22 Mar 2021 13:52:16 -0700 Subject: [PATCH 5/5] Trivial change to kick CI into action. --- changelog/11173.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/11173.txt b/changelog/11173.txt index 2443205cf04c..04b1e6e7aeeb 100644 --- a/changelog/11173.txt +++ b/changelog/11173.txt @@ -1,3 +1,3 @@ ```release-note:change -go: Update go version to 1.15.10 +go: Update Go version to 1.15.10 ```