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

Add Ubuntu 22.04 (jammy) support #16

Merged
merged 6 commits into from
Aug 7, 2023

Conversation

dtseiler
Copy link

@dtseiler dtseiler commented Jun 2, 2023

Description

This PR adds support for Ubuntu 22.04 (jammy jellyfish).

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Chore (non-breaking change that does not add functionality or fix an issue)

Checklist:

  • I have read the CONTRIBUTING document.
  • I have run the pre-merge tests locally and they pass.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commits have been signed-off for the Developer Certificate of Origin.

@ramereth
Copy link

@dtseiler looks like you to add the signed-off-by tag to your commits. See the details on the failure with DCO.

@dtseiler
Copy link
Author

@dtseiler looks like you to add the signed-off-by tag to your commits. See the details on the failure with DCO.

Thanks for pointing this out @ramereth. I've amended the git commit message to include my own sign-off, although the code change was originally written for the old repo by @buck3tsec as I noted in the original note for this PR.

@tpowell-progress
Copy link
Collaborator

build kite run is broken @tpowell-progress

@tpowell-progress tpowell-progress self-assigned this Jul 25, 2023
@dtseiler
Copy link
Author

dtseiler commented Aug 3, 2023

build kite run is broken @tpowell-progress

Is there anything I need to do to get this moving? I'm not familiar with this utility but I just know that our CI pipeline is broken for Ubuntu 22.04 machines at the moment.

@tpowell-progress
Copy link
Collaborator

Is there anything I need to do to get this moving? I'm not familiar with this utility but I just know that our CI pipeline is broken for Ubuntu 22.04 machines at the moment.

Trying to troubleshoot this breakage ... feels like something simple but I've haven't been able to pin it down yet.

@tpowell-progress
Copy link
Collaborator

Is there anything I need to do to get this moving? I'm not familiar with this utility but I just know that our CI pipeline is broken for Ubuntu 22.04 machines at the moment.

Trying to troubleshoot this breakage ... feels like something simple but I've haven't been able to pin it down yet.

Ok @dtseiler found the breakage. Can you rebase on main to pick up the fix? Should be able to merge once you've done that. I have this on my list for follow-up so (likely Monday) can merge.

@dtseiler
Copy link
Author

dtseiler commented Aug 4, 2023

When I run git rebase main from my branch, it tells me this:

dropping 1f4b4eb208705d1f85072728f211047e7968a095 Add Ubuntu 22.04 (jammy) support -- patch contents already upstream

and I can't merge after that without pulling from my branch again. I'm not the biggest git wonk, so not sure what I might be doing wrong. I did a git fetch first as well to get all the current branch info.

@dtseiler
Copy link
Author

dtseiler commented Aug 4, 2023

oh I need to sync my fork, duh

@tpowell-progress tpowell-progress merged commit 897d4d5 into chef:main Aug 7, 2023
@tpowell-progress
Copy link
Collaborator

@dtseiler Merged!

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.

3 participants