ChanServ changed the topic of #freedesktop to: https://www.freedesktop.org infrastructure and online services || for questions about freedesktop.org projects, please see each project's contact || for discussions about specifications, please use https://gitlab.freedesktop.org/xdg or xdg@lists.freedesktop.org
thaller has quit [Remote host closed the connection]
thaller has joined #freedesktop
ppascher has joined #freedesktop
vbenes has joined #freedesktop
thaller is now known as Guest98
Guest98 has quit [Read error: Connection reset by peer]
thaller has joined #freedesktop
ximion has joined #freedesktop
vbenes has quit [Ping timeout: 480 seconds]
<ofourdan>
hi, I made a mistake, I pressed the [Rebase without pipeline] button in https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/56, the CI didn;t run and now gitlab remove the [Merge] button - Clicking [Run pipeline] fails, so I tried to force push to Emil's branch (in the hope that it would trigger a pipeline) but that does nothing - How can I fix this?
<ofourdan>
(all that in good faith, I thought not runnign the pipeline for a simple doc issue would save some energy somewhere!)
vbenes has joined #freedesktop
<__tim>
you could "git commit --amend" and then git push, that will make it look like it changed
<__tim>
maybe running a pipeline manually also works
<ofourdan>
how can I trigger a pipeline manually?
<__tim>
you go to the 'Pipelines' tab and then click 'run pipeline'
<ofourdan>
If I click [Run pipeline] there is a cryptic error message stating that "An error has occured trying to run a new pipeline for this merge request"
<__tim>
you probably need to also resolve open discussions before a merge is possible
<__tim>
maybe you need developer permissions for that, not sure, sorry :)
<ofourdan>
I am manintainer
<__tim>
ah, then I don't know
<daniels>
alanc: gitlab themselves have some quite good docs?
<ofourdan>
thanks for trying to help anyway!
<daniels>
ofourdan: so you can create a new pipeline for a given ref through the CI tab, but then it will just be created for the ref rather than as an MR pipeline
<daniels>
at a guess, you'd probably have to rebase yourself (with --no-ff) and push
<ofourdan>
yeah, I think I'll have to push indeed
<ofourdan>
but taht creates a merge commit
<ofourdan>
(so ftr, that [Rebase without pipeline] button is a little troublemaker, I'll try to remember to never use it again :) )
<daniels>
if you don't want a merge commit, go to settings -> general -> merge request settings, and change to ff rather than merge
<ofourdan>
that's fine, there are merge commits in the past
<ofourdan>
I merged it manually
<ofourdan>
I mean pushed
vbenes has quit [Ping timeout: 480 seconds]
thaller has quit [Read error: Connection reset by peer]
vbenes has joined #freedesktop
dakr has joined #freedesktop
ximion has quit []
<MrCooper>
ofourdan: seems like a bug that GitLab offers the "Rebase without pipeline" button for projects which require the CI pipeline to pass before merging
hakzsam has joined #freedesktop
mupuf has joined #freedesktop
<ofourdan>
indeed
chipxxx has joined #freedesktop
thaller has joined #freedesktop
fahien has quit [Ping timeout: 480 seconds]
chipxxx has quit [Remote host closed the connection]
<__tim>
one of the two windows runners is being updated
<__tim>
and thus temporarily out of service :)
<Arsen>
windows runners, interesting; how does licensing them work?
<Arsen>
that's what was preventing me setting up some windows runners of my own (the idea I had is to provision a up-to-date snapshot weekly and then boot from the snapshots for running actual jobs, which further complicates it)
<daniels>
Arsen: for the shared runners, Microsoft sponsors our licenses
<Arsen>
ah, fair
<__tim>
These are running docker on Windows fwiw
<Arsen>
docker can run windows?
<alatiera>
both runners are online again, backlog should drop
<alatiera>
Arsen for better or worse
<Arsen>
I didn't know that, interesting
thaller has quit [Read error: No route to host]
thaller has joined #freedesktop
<daniels>
alatiera: thanks!
<daniels>
alatiera: I don't know what your schedule is like, but use is definitely lightest in European morning, peaking a bit after lunch, sustained through to dinner time, then dropping off until about midnight
<daniels>
so if you can do updates around European breakfast, that's by far the least invasive
<alatiera>
daniels yea that's what I usually aim for, did all the rest of the runners on saturday
<alatiera>
I queued a disk trim that took way longer than expected
<daniels>
fair enough :)
pohly has quit [Read error: No route to host]
pohly has joined #freedesktop
ybogdano has joined #freedesktop
thaller is now known as Guest119
Guest119 has quit [Read error: Connection reset by peer]
thaller has joined #freedesktop
ximion has joined #freedesktop
kem has quit [Ping timeout: 480 seconds]
kem has joined #freedesktop
ybogdano has quit [Ping timeout: 480 seconds]
AbleBacon_ has joined #freedesktop
AbleBacon_ has quit [Read error: Connection reset by peer]
AbleBacon_ has joined #freedesktop
ngcortes has joined #freedesktop
thaller has quit [Read error: Connection reset by peer]
pohly has quit [Ping timeout: 480 seconds]
AbleBacon_ has quit []
AbleBacon_ has joined #freedesktop
AbleBacon_ has quit []
pohly has joined #freedesktop
ybogdano has joined #freedesktop
thaller has joined #freedesktop
fahien has quit [Ping timeout: 480 seconds]
thaller has quit [Read error: Connection reset by peer]
mvlad has quit [Remote host closed the connection]
pohly has quit []
alanc has quit [Remote host closed the connection]
alanc has joined #freedesktop
ngcortes has quit [Remote host closed the connection]