Skip to content

Backport of cli: remove stray whitespace when loading the consul version from the VERSION file into release/1.13.x#17520

Merged
hc-github-team-consul-core merged 1 commit intorelease/1.13.xfrom
backport/remove-trailing-whitespace-in-version-file/literally-becoming-porpoise
May 30, 2023
Merged

Backport of cli: remove stray whitespace when loading the consul version from the VERSION file into release/1.13.x#17520
hc-github-team-consul-core merged 1 commit intorelease/1.13.xfrom
backport/remove-trailing-whitespace-in-version-file/literally-becoming-porpoise

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #16467 to be assessed for backporting due to the inclusion of the label backport/1.13.

The below text is copied from the body of the original PR.


Fixes a regression from #15631 in the output of consul version from:

Consul v1.16.0-dev
+ent
Revision 56b86acbe5+CHANGES

to

Consul v1.16.0-dev+ent
Revision 56b86acbe5+CHANGES

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) May 30, 2023 20:39
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/remove-trailing-whitespace-in-version-file/literally-becoming-porpoise branch 2 times, most recently from 4bb9eb1 to 1e9047c Compare May 30, 2023 20:39
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 5ab3ac8 into release/1.13.x May 30, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/remove-trailing-whitespace-in-version-file/literally-becoming-porpoise branch May 30, 2023 20:51
@zalimeni
Copy link
Copy Markdown
Member

Note for posterity: the original fix was merged just before the bug was introduced in 1.13.x due to backports of the bug getting delayed. This fix backport brings things back in sync.

nathancoleman added a commit to hashicorp/consul-api-gateway that referenced this pull request Jun 20, 2023
1.13.8 has a known issue preventing the tests from running due to a missed backport. That backport has since been completed in hashicorp/consul#17520
nathancoleman added a commit to hashicorp/consul-api-gateway that referenced this pull request Jun 20, 2023
* Update conformance testing matrix for Consul 1.15

* Add Consul 1.16 to conformance testing matrix

* Disable management of external CRDs for consul-k8s>=1.2.0

* Update Consul version pins for CI

* Add Consul 1.16 version to CI testing matrix

* Restore Consul 1.13.7 to testing matrix

1.13.8 has a known issue preventing the tests from running due to a missed backport. That backport has since been completed in hashicorp/consul#17520
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants