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

Move to Fedora 39 #1490 #2719

Merged
merged 2 commits into from
Nov 8, 2023

Conversation

yasminvalim
Copy link
Contributor

This PR, detailed in Issue , follows the necessary steps to prepares for the upcoming Fedora CoreOS 39 GA release by updating fedora-coreos-config.

FYI: Previously, there was another branch, but I set it as a draft and started working on this new one after running into some issues with the rebase. If you'd like to review the discussion on that pull request, please feel free to do so.

@jlebon
Copy link
Member

jlebon commented Nov 7, 2023

This is looking close! I think we also want the image.yaml from next-devel.

Also, it looks like there's some minor end of file newline differences in the lockfiles (this is minor but it shows up in a git diff between the two, and it'd be nice to have that diff be minimized to the strict necessary). Something like this should work:

git restore --source=origin/next-devel image.yaml manifest-lock*
git add image.yaml manifest-lock*
git commit --amend --no-edit

Comment on lines 17 to 28
selinux-policy:
evra: 39.1-1.fc39.noarch
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-24872e50a0
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
type: fast-track
selinux-policy-targeted:
evra: 39.1-1.fc39.noarch
metadata:
bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-24872e50a0
reason: https://github.com/coreos/fedora-coreos-tracker/issues/1490#issuecomment-1720020468
type: fast-track
Copy link
Member

Choose a reason for hiding this comment

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

note that next-devel just dropped this in #2718

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for that. Fixed it.

@yasminvalim yasminvalim force-pushed the fedora-39-release branch 2 times, most recently from 287263a to 2912bb0 Compare November 7, 2023 18:36
@yasminvalim
Copy link
Contributor Author

This is looking close! I think we also want the image.yaml from next-devel.

Also, it looks like there's some minor end of file newline differences in the lockfiles (this is minor but it shows up in a git diff between the two, and it'd be nice to have that diff be minimized to the strict necessary). Something like this should work:

git restore --source=origin/next-devel image.yaml manifest-lock*
git add image.yaml manifest-lock*
git commit --amend --no-edit

Thanks for reviewing! I added the image.yaml now.
This newline differences are some default configuration in VScode, I am fixing it right now.

@yasminvalim yasminvalim force-pushed the fedora-39-release branch 3 times, most recently from 63840d7 to 70a0938 Compare November 7, 2023 19:08
@yasminvalim
Copy link
Contributor Author

This is looking close! I think we also want the image.yaml from next-devel.

Also, it looks like there's some minor end of file newline differences in the lockfiles (this is minor but it shows up in a git diff between the two, and it'd be nice to have that diff be minimized to the strict necessary). Something like this should work:

git restore --source=origin/next-devel image.yaml manifest-lock*
git add image.yaml manifest-lock*
git commit --amend --no-edit

I have two questions:

1 - In the manifest.yaml file in next-devel, there is this part at the end:


conditional-include:
  # we only want these in next for now; see
  # https://github.com/coreos/fedora-coreos-tracker/issues/1375
  - if: basearch == "x86_64"
    include: manifests/crun-wasm.yaml
  - if: basearch == "aarch64"
    include: manifests/crun-wasm.yaml

Should it be included too?

2 - The other question is about the red circles in my PR who suggest that there is a empty line in some files. I already fix it in my vscode settings and committed applying the changes, but is still appearing here. Do you have any idea how to solve it?

Thanks 😸

@jlebon
Copy link
Member

jlebon commented Nov 7, 2023

I have two questions:

1 - In the manifest.yaml file in next-devel, there is this part at the end:


conditional-include:
  # we only want these in next for now; see
  # https://github.com/coreos/fedora-coreos-tracker/issues/1375
  - if: basearch == "x86_64"
    include: manifests/crun-wasm.yaml
  - if: basearch == "aarch64"
    include: manifests/crun-wasm.yaml

For now, no. We may remove that bit soon separately (see #2690).

Should it be included too?

2 - The other question is about the red circles in my PR who suggest that there is a empty line in some files. I already fix it in my vscode settings and committed applying the changes, but is still appearing here. Do you have any idea how to solve it?

Hmm, I'm not sure. It may still be VS Code playing tricks. The surest way to squash those is to do it from the command-line instead using the commands I provided in #2719 (comment).

@yasminvalim yasminvalim force-pushed the fedora-39-release branch 2 times, most recently from 1b55dbe to 5de82fe Compare November 7, 2023 20:49
@yasminvalim
Copy link
Contributor Author

yasminvalim commented Nov 7, 2023

@jlebon I was able to fix it, finally. I think everything is okay now.
Thanks a lot! 😸

@jlebon
Copy link
Member

jlebon commented Nov 7, 2023

OK, this is looking great! But the manifest.yaml has unwanted changes. I might've misunderstood your question 1 in the previous comment. Apart from the releasever change, manifest.yaml needs to stay the same.

jlebon
jlebon previously approved these changes Nov 7, 2023
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for doing this!

@jlebon jlebon enabled auto-merge (rebase) November 7, 2023 22:14
dustymabe and others added 2 commits November 7, 2023 22:31
Bump releasever in manifest.yam,bump the version in dockerfile and tests,  sync the lockfiles for all arches from next-devel for Fedora 39 release.
@dustymabe dustymabe dismissed jlebon’s stale review November 8, 2023 03:42

The merge-base changed after approval.

@dustymabe dustymabe disabled auto-merge November 8, 2023 03:42
@dustymabe dustymabe merged commit 249a1fd into coreos:testing-devel Nov 8, 2023
2 of 3 checks passed
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