Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maint(refinery): Move 2.x working branch back into main #370

Merged
merged 3 commits into from
Jun 13, 2024

Conversation

TylerHelmuth
Copy link
Contributor

Which problem is this PR solving?

Moves the 2.x working branch commits back into main. We MUST deliberately do a merge commit when merging NOT A SQUASH COMMIT, to ensure the tagged commits from 2.x-working-branch end up in main.

Short description of the changes

  • handles a merge of main into 2.x-working-branch
  • bumps the refinery chart version to appease CI

How to verify that this has the expected result

## Which problem is this PR solving?

For the 2.X version of the refinery helm chart, updates the default
refinery version to be 2.5.1

- Closes #361

## Short description of the changes

- bump appVersion to 2.5.1
- bump chart version to 2.9.1
- update CI to check against refinery-2.X-work-branch instead of main

## How to verify that this has the expected result

Local testing
## Which problem is this PR solving?

Bumps the default refinery version to 2.5.2

- Closes #366
- Closes #365

## Short description of the changes
- bump appVersion to 2.5.2

## How to verify that this has the expected result
Local tests
@TylerHelmuth TylerHelmuth marked this pull request as ready for review June 13, 2024 21:14
@TylerHelmuth TylerHelmuth requested a review from a team as a code owner June 13, 2024 21:14
Copy link
Contributor

@kentquirk kentquirk left a comment

Choose a reason for hiding this comment

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

Did it live

@TylerHelmuth TylerHelmuth merged commit a14988c into main Jun 13, 2024
4 checks passed
@TylerHelmuth TylerHelmuth deleted the tyler.move-2.x-back-to-main-attempt-2 branch June 13, 2024 21:15
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.

2 participants