Skip to content

Backport of [NET-4103] ci: build s390x into release/1.15.x#18117

Merged
loshz merged 1 commit intorelease/1.15.xfrom
backport/loshz/NET-4103-build-s390x/logically-infinite-fish
Jul 13, 2023
Merged

Backport of [NET-4103] ci: build s390x into release/1.15.x#18117
loshz merged 1 commit intorelease/1.15.xfrom
backport/loshz/NET-4103-build-s390x/logically-infinite-fish

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@loshz
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Description

This PR adds build and unit test support for the s390x architecture in Consul Enterprise automated workflows.

The following changes have been made:

  • Build the Consul binary for s390x.
  • Run tests using a dev build of the above binary.

Tested in ENT: https://github.com/hashicorp/consul-enterprise/pull/6265


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/NET-4103-build-s390x/logically-infinite-fish branch from 1bbf911 to 5d8dbb2 Compare July 12, 2023 23:10
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/NET-4103-build-s390x/logically-infinite-fish branch from 5d8dbb2 to 1bbf911 Compare July 12, 2023 23:10
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 12, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 12, 2023 23:14 Inactive
@loshz loshz force-pushed the backport/loshz/NET-4103-build-s390x/logically-infinite-fish branch from 955f2cb to 55e8631 Compare July 12, 2023 23:32
@loshz loshz marked this pull request as ready for review July 13, 2023 00:00
@loshz loshz requested a review from a team July 13, 2023 00:00
@loshz loshz requested a review from a team as a code owner July 13, 2023 00:00
@loshz loshz requested review from claire-labry and dekimsey and removed request for a team July 13, 2023 00:00
@loshz loshz merged commit 4582260 into release/1.15.x Jul 13, 2023
@loshz loshz deleted the backport/loshz/NET-4103-build-s390x/logically-infinite-fish branch July 13, 2023 00:00
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