Universal Blue•3y ago•

293 replies

Yeah luckily we can clean the clutter

Yeah... luckily we can clean the clutter later

bsherman•9/29/23, 5:31 PM

maybe we thread this for discussion

bsherman•9/29/23, 5:32 PM

I'll restate in a better way than my emotional

earlier.

bsherman•9/29/23, 5:32 PM

We approved this propsal: https://github.com/ublue-os/main/issues/369

GitHub

Proposal: reduce the scope of ublue-os/main images · Issue #369 · u...

Summary Revise scope of Universal Blue Main Images such that kmods (and associated kernel packages) are no longer included. Description The purpose of this change is to streamline build processes(c...

bsherman•9/29/23, 5:33 PM

So I want to put together a set of of PRs in main, asus, surface, bazzite, and bluefin which demonstrate this scenario

bsherman•9/29/23, 5:34 PM

This is @EyeCantCU's first draft of mainmain https://github.com/ublue-os/main/pull/375

bsherman•9/29/23, 5:35 PM

I'll probably drop a distinct PR to demonstrate my thoughts better...

I appreciate the work on this PR, but I am most concerned about future maintenance... so, seems we should have a "legacy" and "normal" path that's a little easier to follow., so I'll probably branch from this branch for my PR, because I'll build on this work.

EyeCantCUOP•9/29/23, 6:11 PM

Sorry. I've been wanting to give this a proper response but we're about to leave for the next day and a half or so. If we changed the implementation a little bit (prevented tagged PR images from being used outside the org so that things proceed as normal), I think it would be awesome to do

EyeCantCUOP•9/29/23, 6:12 PM

The limitation I ran into here was that as soon as someone from an external repo opened a PR, it fell apart for a couple reasons that I'm going to have a hard time explaining here

EyeCantCUOP•9/29/23, 6:13 PM

We can jump into tty or something later tomorrow and maybe even today if I have any time

EyeCantCUOP•9/29/23, 6:18 PM

Real quick, while I can, the cosign pairs have to match and the user also needs to be a part of that repo if I'm not mistaken. Meaning an outside PR from a different repo, will refuse to push to the tag

EyeCantCUOP•9/29/23, 6:19 PM

Again sorry

EyeCantCUOP•9/29/23, 6:20 PM

Two different things being discussed here

EyeCantCUOP•9/29/23, 6:20 PM

Disregard all that ^ lmao

bsherman•9/29/23, 6:28 PM

i think this was all meant for the other thread

EyeCantCUOP•10/12/23, 4:04 AM

@bsherman figured I'd necro this since F39 is due soon (release got pushed back a little). Just want to clarify what a legacy and normal path looks like to you. Do we split the Containerfiles away, removing all legacy stuff from the new stuff, then adapt the build workflow?

bsherman•10/12/23, 2:07 PM

appreciate the necro

bsherman•10/12/23, 2:08 PM

the last week got really busy

bsherman•10/12/23, 2:11 PM

i'm working on that PR now

EyeCantCUOP•10/12/23, 3:13 PM

Awesome!

bsherman•10/12/23, 3:15 PM

I'm almost done... Containerfile/scripts are finishing testing now...

will just need to tweak the workflow

bsherman•10/12/23, 3:15 PM

do you want me to make a distinct PR or just update yours?

EyeCantCUOP•10/12/23, 3:16 PM

Either way would work for me. Whatever is easier for you

bsherman•10/12/23, 3:19 PM

well, i'd prefer fewer PRs for less confusion, otherwise i don't care

bsherman•10/12/23, 3:21 PM

see what I did here if interested: https://github.com/ublue-os/main/pull/375/files

I have NOT updated workflows/build.xml yet... doing that now

EyeCantCUOP•10/12/23, 3:42 PM

I'll have a look

Bbsherman see what I did here if interested: <https://github.com/ublue-os/main/pull/375/f...

EyeCantCUOP•10/12/23, 3:46 PM

This is much cleaner and much more straight to the point. Less confusing as well

bsherman•10/12/23, 3:46 PM

thank you

bsherman•10/12/23, 3:46 PM

it is working better than I had feared, too, which is good

EyeCantCUOP•10/12/23, 3:47 PM

That's awesome. Setting up CI shouldn't be too bad

bsherman•10/12/23, 3:47 PM

almost ready to push again

bsherman•10/12/23, 3:47 PM

yeah, the main issue will be adding logic to the downstream repos

bsherman•10/12/23, 3:48 PM

Dunno if you saw, but I did add some improvements to the README for akmods repo
https://github.com/ublue-os/akmods#how-its-organized

EyeCantCUOP•10/12/23, 3:48 PM

Yeah. I'm going to need to investigate more of what that's going to take. I'll have a look

EEyeCantCU Yeah. I'm going to need to investigate more of what that's going to take. I'll h...

bsherman•10/12/23, 3:48 PM

well

bsherman•10/12/23, 3:49 PM

we're going to have 2 resulting artifacts from this push... I'm getting rid of *-nokmods*-nokmods and instead... all *-main*-main images will be nokmods by default... but on F37/F38 there will also *-kmods*-kmods

EyeCantCUOP•10/12/23, 3:52 PM

Took my medicine on an empty stomach and it just hit hard. One sec. Brb

bsherman•10/12/23, 3:53 PM

so... the *-nvidia*-nvidia images... to keep current behaviors the same... will need to build from *-kmods*-kmods for F37/F38 but *-main*-main for F39 and forward...

but asusasus and surfacesurface already build from *-nokmods*-nokmods so they just need to switch to *-main*-main since those will always be "nokmods"

Bazzite and Bluefin are more complicated becasue they build from main/nvidia/asus/surface repos.

Bbsherman we're going to have 2 resulting artifacts from this push... I'm getting rid of `...

EyeCantCUOP•10/12/23, 3:55 PM

This sounds great to me

bsherman•10/12/23, 3:55 PM

ugh

bsherman•10/12/23, 3:55 PM

i just re-read our proposal

bsherman•10/12/23, 3:55 PM

this approach conflicts with the proposal

EyeCantCUOP•10/12/23, 3:56 PM

Ackk

bsherman•10/12/23, 3:56 PM

adding that timeline concession really made this hard

EyeCantCUOP•10/12/23, 3:57 PM

Yeah. I was hoping to knock this out earlier but I've been busy as well

bsherman•10/12/23, 3:57 PM

ok, i'm going to think on the matrix a bit more but WITH the proposal up on my screen

EyeCantCUOP•10/12/23, 3:59 PM

Sounds good. I'll get things pulled up as well and assess what this should look like

bsherman•10/12/23, 4:19 PM

ok, just pushed again

bsherman•10/12/23, 4:19 PM

i THINK this will work per the proposal

EyeCantCUOP•10/12/23, 4:23 PM

Awesome. I'll have a look

bsherman•10/12/23, 4:24 PM

hmm

Yeah luckily we can clean the clutter

Similar Threads

Similar Threads

Similar Threads