-
Kev
https://github.com/xsf/xeps/pull/1248/files seems to confuse the triage.sh, which claims it's trying to both add a protoxep and edit an existing xep in one commit.
-
Guus
it is nice to see that someone else took over from Jonas to spam my mailbox <3
-
Kev
It looks like the issue wasn't in triage.sh
-
Zash
It's happening! Go Kev! :D
-
Kev
It's not everything, but I've just spent a couple of hours on some triage and some merge.
-
Kev
It's not big and it's not clever, but https://github.com/xsf/xeps/blob/master/tools/merge-helper.sh removes some of the monotony from this.
-
Kev
So my Editor flow is now, approximately: Open 3 terminals in xeps.git T1: git pull --rebase && ./tools/merge-helper.sh Continue until it says to do merges, then T2: ./tools/local/triage.sh each time I merge one of the PRs T3: git pull --rebase then when I'm done with triage/merge close T2 Back in T1 continue until it tells me to generate docker images, at which point T3: ../upload-xeps.sh once that completes, follow T1 to completion.
-
Kev
And upload-xeps.sh is │ File: ../upload-xeps.sh ───────┼────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── 1 │ #!/bin/bash 2 │ set -e 3 │ XEPIMAGE=registry.gitlab.com/xsf/xeps/packed:main-latest 4 │ ATTICIMAGE=registry.gitlab.com/xsf/xep-attic/packed:main-latest 5 │ pushd path/to/xeps 6 │ docker build --build-arg NCORES=64 -t $XEPIMAGE . 7 │ docker push $XEPIMAGE 8 │ popd 9 │ pushd path/to/xep-attic 10 │ docker build --build-arg NCORES=64 -t $ATTICIMAGE . 11 │ docker push $ATTICIMAGE 12 │ popd 13 │ ssh -t xmpp.org "sudo ./xeps-up.sh"
-
wurstsalat
Kev: out of curiosity, how long does the xeps build run?
-
Kev
With 64 threads? Not long, but I didn't time it.
-
wurstsalat
alright, thanks. last time I built it, PDF generation took the majority of time. (does anybody use these?)
-
Kev
When I first ran it today, and it was running with -j 1 it was certainly very slow.
-
tmolitor
why does https://xmpp.org/extensions/ not list 0388 as recently updated?
-
Kev
I don't think that's an Editor question, I think that's down to the website.
-
Kev
Which isn't that I'm saying it's bad to ask here, but I don't know that the people who'll know the answer are necessarily here.
-
tmolitor
ah well, I thought maybe the docker containers cited above also update the website
-
tmolitor
never mind then :)
-
tmolitor
another question: in the xsf muc you listed a couple of updates, why is the sasl upgrade protoxep missing? (Overhaul SCRAM Upgrade ProtoXEP to include definition of SASL2 upgrade tasks)
-
Kev
Because that doesn't generate an entry in the attic :)
-
Kev
(Which is the output that I copy/pasted)
-
emus
> tmolitor: > 2023-03-31 04:26 (GMT+02:00) > why does https://xmpp.org/extensions/ not list 0388 as recently updated? wurstsalat:
-
tmolitor
Kev ah, thanks
-
wurstsalat
tmolitor: website is updated separately in a different interval
-
tmolitor
wurstsalat, ah, thanks!
-
emus
tmolitor: fyi
-
emus
xmpp:iteam@muc.xmpp.org?join