Skip to content

Fix for 1.6.x: Add vault revision to --version cmd#13445

Merged
mladlow merged 2 commits intorelease/1.6.xfrom
fix-vault-version-1.6.x
Dec 16, 2021
Merged

Fix for 1.6.x: Add vault revision to --version cmd#13445
mladlow merged 2 commits intorelease/1.6.xfrom
fix-vault-version-1.6.x

Conversation

@mdeggies
Copy link
Copy Markdown
Member

@mdeggies mdeggies commented Dec 15, 2021

The output of ./vault --version changed since Vault onboarded to CRT/GitHub Actions for building artifacts.

elle: ~/Users/elle/Downloads $ ./vault version
Vault v1.9.1
elle: ~/Users/elle/Downloads $ ./vault version
Vault v1.8.1 (4b0264f28defc05454c31277cfa6ff63695a458d)

This change adds back in the revision string to the version command. Output from the artifacts built on this branch:

elle: ~/Users/elle/Downloads $ ./vault --version
Vault v1.10.0-dev (9e2f21337b47d8ef59f057b6d192d6fde2c5fb19)

@mdeggies mdeggies requested a review from a team December 15, 2021 19:43
@vercel
Copy link
Copy Markdown

vercel bot commented Dec 15, 2021 •
edited
Loading

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

vault – ./website

🔍 Inspect: https://vercel.com/hashicorp/vault/Biout3ULWuJEXapF35VPdQcC49Et
✅ Preview: Canceled

[Deployment for 418498d canceled]

vault-storybook – ./ui

🔍 Inspect: https://vercel.com/hashicorp/vault-storybook/BXHzbtqPaXem4LHY7W2SHxwgtqq9
✅ Preview: Canceled

[Deployment for 418498d canceled]

@mdeggies mdeggies changed the base branch from main to release/1.6.x December 15, 2021 19:43
@mladlow mladlow added this to the 1.9.2 milestone Dec 15, 2021
@mladlow
Copy link
Copy Markdown
Contributor

mladlow commented Dec 15, 2021

Do you know what's up with the pre-flight checks?

@mladlow
Copy link
Copy Markdown
Contributor

mladlow commented Dec 15, 2021

I'm going to re-milestone this for 1.9.3. I'd like to merge it, but it doesn't need to happen this week.

@mladlow mladlow modified the milestones: 1.9.2, 1.9.3 Dec 15, 2021
@mdeggies
Copy link
Copy Markdown
Member Author

mdeggies commented Dec 15, 2021 •
edited
Loading

I'm taking a look now- edit: the .circleci/Makefile file was broken. I pushed up a fix for the makefile and then ran make ci-config && make ci-verify. I'll also check the other branches to see if any of them are broken too

@vercel vercel bot temporarily deployed to Preview – vault December 15, 2021 23:13 Inactive
@vercel vercel bot temporarily deployed to Preview – vault-storybook December 15, 2021 23:13 Inactive
@mladlow
Copy link
Copy Markdown
Contributor

mladlow commented Dec 16, 2021

The other branches looked good - at least that check was passing.

@mladlow mladlow merged commit e253798 into release/1.6.x Dec 16, 2021
@mladlow mladlow deleted the fix-vault-version-1.6.x branch December 16, 2021 15:04
MochaCaffe pushed a commit to kosmos-education/vault that referenced this pull request Apr 15, 2026
@hc-github-team-secure-vault-core @stevendpclark
Fix TestPki_MultipleOUs failing on slow machines (hashicorp#13390) (h…
0aa5a51 
…ashicorp#13439) (hashicorp#13445)

Co-authored-by: Steven Clark <steven.clark@hashicorp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@mladlow mladlow mladlow approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

pr/no-changelog

Projects

None yet

Milestone

1.9.3

Development

Successfully merging this pull request may close these issues.

2 participants

@mdeggies @mladlow