i would like to resolve this by force pushing `ublue-os/nvidia` such that those last 3 commits never

i would like to resolve this by force pushing

ublue-os/nvidia

ublue-os/nvidia

ublue-os/nvidia

ublue-os/nvidia such that those last 3 commits never existed

EyeCantCU•12/8/23, 4:44 PM

I agree

EyeCantCU•12/8/23, 4:44 PM

Apologies for everyone. Really screwed up there

EyeCantCU•12/8/23, 4:44 PM

I hadn't even noticed

bshermanOP•12/8/23, 4:44 PM

I only noticed due to build failures... and then i was surprised because it was obvious we didn't have PRs for those commits

EyeCantCU•12/8/23, 4:45 PM

Maybe GitHub tried to merge both repositories when the PR was opened?

Bbsherman i would like to resolve this by force pushing `ublue-os/nvidia` such that those ...

bshermanOP•12/8/23, 4:45 PM

@EyeCantCU @akdev

I'll do this now

EyeCantCU•12/8/23, 4:45 PM

Thank you so much

akdev•12/8/23, 4:45 PM

Sounds good to me, thanks for fixing it

jstone•12/8/23, 4:46 PM

This sounds related to when I requested somebody with the right permissions to sync the asus-nvidia repo, which looks like a fork of the nvidia repo. I wonder what happened there. Did github try to be "smart" by automatically applying merges to the fork and the upstream?

EyeCantCU•12/8/23, 4:47 PM

I honestly have no idea but that's definitely not smart behavior lol

bshermanOP•12/8/23, 4:47 PM

is that request above?

jstone•12/8/23, 4:48 PM

💾ublue-dev

bshermanOP•12/8/23, 4:48 PM

ok, i read it

bshermanOP•12/8/23, 4:48 PM

SEEMS simple...

Jjstone This sounds related to when I requested somebody with the right permissions to s...

bshermanOP•12/8/23, 4:50 PM

thanks for calling out the correlation.

jstone•12/8/23, 4:50 PM

The changes seem reasonable in asus-nvidia

jstone•12/8/23, 4:50 PM

I only detected the drivers being updated

bshermanOP•12/8/23, 4:52 PM

hmm... it looks like
1) changes synced from nvidia > asus-nvidia
2) changes synced from asus-nvidia > nvidia
3) changes synced from nvidia > surface-nvidia
4) changes synced from surface-nvidia > nvidia

EyeCantCU•12/8/23, 4:53 PM

With 2 PRs though?

bshermanOP•12/8/23, 4:54 PM

i thinik it's more likely the "sync" operations bypassed something

EyeCantCU•12/8/23, 4:54 PM

Shoot

bshermanOP•12/8/23, 4:54 PM

clearly there was no PR to merge from asus/surface > nvidia

bshermanOP•12/8/23, 4:57 PM

hah, i can't even force push a revert, so clearly you didn't do that @EyeCantCU it had to be some use ofthe github tooling

bshermanOP•12/8/23, 4:58 PM

Ok, fixed

ublue-os/nvidia

ublue-os/nvidia

$ git push --force
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Bypassed rule violations for refs/heads/main:
remote:
remote: - Changes must be made through the merge queue
remote:
remote: - Changes must be made through a pull request.
remote:
remote: - Cannot force-push to this branch
remote:
To github.com:ublue-os/nvidia.git
 + 83ca789...8119dd2 main -> main (forced update)

$ git push --force
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Bypassed rule violations for refs/heads/main:
remote:
remote: - Changes must be made through the merge queue
remote:
remote: - Changes must be made through a pull request.
remote:
remote: - Cannot force-push to this branch
remote:
To github.com:ublue-os/nvidia.git
 + 83ca789...8119dd2 main -> main (forced update)

EyeCantCU•12/8/23, 4:59 PM

What a mess

bshermanOP•12/8/23, 4:59 PM

re-running the nvidia build for today

bshermanOP•12/8/23, 5:29 PM

regardless, no nvidia builds today due to upstream fedora/rpmfusion churn

EyeCantCU•12/8/23, 5:54 PM

@jstone refreshed supergfxctl and the plasmoid. Combatting some problems building the GNOME shell extension but that should be done here soon

jstone•12/8/23, 6:18 PM

Ah interesting, what's going on here? https://download.copr.fedorainfracloud.org/results/eyecantcu/supergfxctl/fedora-39-x86_64/06734840-gnome-shell-extension-supergfxctl-gex/builder-live.log.gz

Jjstone Ah interesting, what's going on here? https://download.copr.fedorainfracloud.org...

EyeCantCU•12/8/23, 6:21 PM

Looks like deps changed a bit or something but the instructions haven't changed so I'm kind of throwing stuff at the wall

EEyeCantCU Looks like deps changed a bit or something but the instructions haven't changed ...

jstone•12/8/23, 6:29 PM

Has the package moved? https://www.npmjs.com/package/undici-types

npm

undici-types

A stand-alone types package for Undici. Latest version: 6.0.1, last published: 2 days ago. Start using undici-types in your project by running npm i undici-typesnpm i undici-types. There are 67 other projects in the npm registry using undici-types.

jstone•12/8/23, 6:30 PM

I'm not very familiar with NPM

Jjstone Has the package moved? https://www.npmjs.com/package/undici-types

EyeCantCU•12/8/23, 6:32 PM

I'm not either. Kind of confused because it says it installs then complains during build that it can't find it

EyeCantCU•12/8/23, 6:33 PM

And I'm almost certain they didn't change tsconfig.json but not upload it?

EEyeCantCU And I'm almost certain they didn't change tsconfig.json but not upload it?

jstone•12/8/23, 6:45 PM

I have an idea -- could we use this as a source? https://extensions.gnome.org/extension/5344/supergfxctl-gex/

jstone•12/8/23, 6:45 PM

I can confirm that installing this as a user extension works in Gnome 45

EyeCantCU•12/8/23, 6:45 PM

Would solve the issue of needing to build it. Let me try

jstone•12/8/23, 6:46 PM

It would just have to be for the F39 build, F38 should be fine

EyeCantCU•12/8/23, 6:46 PM

Yeah. Not rebuilding 37/38 since they don't have 45 and 45 broke prior extensions support

jstone•12/8/23, 6:47 PM

As a workaround mostly, and in the meantime file a bug in the upstream issue tracker showing the build log errors

EyeCantCU•12/8/23, 6:47 PM

Will definitely open one

jstone•12/8/23, 6:47 PM

Thank you!

EyeCantCU•12/8/23, 6:48 PM

No problem. If I can't get this sorted soon though I am going to have to push it to tomorrow afternoon. Exam first thing in the morning

jstone•12/8/23, 6:48 PM

That sounds good to me

jstone•12/8/23, 6:49 PM

My apologies for springing this on you

EyeCantCU•12/8/23, 6:55 PM

Oh wow. This is nicer. Just need to extract the zip and copy to /usr/blah where system extensions are

Jjstone My apologies for springing this on you

EyeCantCU•12/8/23, 6:55 PM

And no problem. Happy to help with anything

jstone•12/8/23, 6:57 PM

Yeah in theory it should streamline the build as there's be no need for NPM

jstone•12/8/23, 6:58 PM

Although I still wonder what to do about these build failures

jstone•12/8/23, 6:59 PM

At this point the image is just providing the extension so that a user doesn't have to manually install it into their homedir

$ git push --force Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Bypassed rule violations for refs/heads/main: remote: remote: - Changes must be made through the merge queue remote: remote: - Changes must be made through a pull request. remote: remote: - Cannot force-push to this branch remote: To github.com:ublue-os/nvidia.git + 83ca789...8119dd2 main -> main (forced update)

i would like to resolve this by force pushing `ublue-os/nvidia` such that those last 3 commits never

Similar Threads