Universal Blue•3y ago

It is protected

EEyeCantCU I don't understand how opening an MR into ASUS/Surface NVIDIA would impact main

bsherman•12/8/23, 4:38 PM

to me, it looks like the change was merged locally and pushed

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

I didn't do that

Aakdev It is protected

bsherman•12/8/23, 4:38 PM

it is protected... but... i think we allow bypassing of rules by those with perms

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

Not dumb enough to merge BOTH repos into NVIDIA and force push

EEyeCantCU Not dumb enough to merge BOTH repos into NVIDIA and force push

bsherman•12/8/23, 4:39 PM

i'm not quite sure how it happened either, that's why I'm bringing it up

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

I did this via GitHub last night so maybe I overlooked something there?

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

Very confused

Bbsherman it is protected... but... i think we allow bypassing of rules by those with perm...

akdevOP•12/8/23, 4:39 PM

Yeah but you still need to force push I believe

Aakdev Yeah but you still need to force push I believe

bsherman•12/8/23, 4:39 PM

i agree, i think that's required

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

The PRs never even existed for NVIDIA which makes zero sense

EEyeCantCU The PRs never even existed for NVIDIA which makes zero sense

bsherman•12/8/23, 4:40 PM

yep, exactly why i was extra confused

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

Like how would both repos get changed from one PR?

bsherman•12/8/23, 4:41 PM

honestly, i'm a little nervous about the pull app

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

Shouldn't the pull app only work one way?

bsherman•12/8/23, 4:42 PM

yes, but i had weird behavior and ended up almost pushing stuff to the wrong repo after adding it

bsherman•12/8/23, 4:43 PM

i would like to resolve this by force pushing

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

bsherman•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 ...

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

@EyeCantCU @akdev

I'll do this now

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

Thank you so much

akdevOP•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

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

is that request above?

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

💾ublue-dev

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

ok, i read it

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

SEEMS simple...

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

bsherman•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

bsherman•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?

bsherman•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

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

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

bsherman•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

bsherman•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

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

re-running the nvidia build for today

bsherman•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?

$ 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)

It is protected

Similar Threads

Similar Threads

Similar Threads