Re: [qubes-devel] Default branch switched to 'main'

2022-11-29 Thread Demi Marie Obenour
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

On Tue, Nov 29, 2022 at 04:54:51PM +0100, Marek Marczykowski-Górecki wrote:
> On Mon, Nov 28, 2022 at 01:40:31AM -0500, Demi Marie Obenour wrote:
> > On Mon, Nov 28, 2022 at 04:02:50AM +0100, Marek Marczykowski-Górecki wrote:
> > > Hello,
> > > 
> > > Since some time already, new repositories in QubesOS github org had
> > > 'main' as default branch. I've just switched default branch to 'main'
> > > for existing repositories too.
> > > For transitional period, both 'master' and 'main' branches will exist,
> > > and will be kept in sync (there is a bot for that). So, all repo clones,
> > > builder.conf files etc should remain valid. Existing pull requests
> > > should remain unaffected too.
> > > My current plan is to keep this transitional period at least until R4.1
> > > EOL. The reasoning is that any existing build/devel environment for
> > > R4.1 should remain functional as long as R4.1 is supported. But any new
> > > environment for R4.2 should use new branch names already.
> > > Example R4.2's builder.conf qubes-builder (v1) is updated already. The
> > > one for qubes-builderv2 will be updated shortly.
> > 
> > Does not work for me:
> > 
> > -> Updating sources for builder-github...
> > --> Fetching from origin main...
> > fatal: couldn't find remote ref main
> > make: *** [Makefile:224: builder-github.get-sources] Error 1
> 
> I went through repos list again, hopefully haven't missed anything
> important this time...

Another error:

-> Updating sources for python-xcffib...
--> Fetching from origin main...
--> Verifying tags...
---> No tag pointing at 09c10f07c1e0bfd8ee1248f887e2b1f2f274be08
---> 09c10f07c1e0bfd8ee1248f887e2b1f2f274be08 is a commit signed by a 
trusted key ― did the signer forget to add a tag?

Also linux-yum’s main branch is behind master (by two commits).
- -- 
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
-BEGIN PGP SIGNATURE-

iQIzBAEBCgAdFiEEdodNnxM2uiJZBxxxsoi1X/+cIsEFAmOGjOYACgkQsoi1X/+c
IsFsahAAmx0Fl+D7N1Hing+lbXmB+TMombEj4XCUUgTgHdCgccXEoGat6hZGVUs6
nxcUVYrYhIWjZE2CVtMJf9V8Dn03PCxnBOsoJnpypqaD5g0fPgukOPHRSHUubhbM
XB83KuucOzcMrXLAb+oLDJaima7zu8LK+4kCXpkUtX57ddXoivYnEmVXhrEhBoXZ
VoE2FMQjavP518awcJ8jjXEaUzXTWr/MEbmEYFLPjUSCcu/CK3R3tBlzXZEkNPsx
vhk6IJ/eb4B1NCe+qHZwF3yNFl7G8g7QWnvosQS/t1wR8pP9KOBdM+6k0MtJIsfh
RPsHQUnCuvQkmlHUnGJFJlXyl5KW7yrT66HuyA7YTpJh36vQWdUfVZNNJCBacxlT
Fv/sm7DY1Spm1zWpUreNZtBQ9ibXxMupSF26MfkyviGpaCc3H1Ah06bW6oQS5T1f
AdbbAyeWCe7UwUkB0LpzUEz1NfF18geNQDb9tlDY2uwdWPYzjseSt8E3UtvhC5Xj
dHwj0uHj9a3fArfb8BPVLt6G+EynDj6cJfEhdxdGE0bB9e6R7wCD7ERU5rtIfdKt
LXwHyOwe8karjInAZo9teG8DOU/VrchWX/LlnrBqLPJLcIzUD9egpHEgOTspzxMQ
J0CgDRaYR47ht+gYF1JuqweXD5VpGWB1NTAfkHi9IW7CSbrcxXI=
=8JuE
-END PGP SIGNATURE-

-- 
You received this message because you are subscribed to the Google Groups 
"qubes-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to qubes-devel+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/qubes-devel/Y4aM5f42%2BPnho1Xs%40itl-email.


Re: [qubes-devel] Default branch switched to 'main'

2022-11-29 Thread Marek Marczykowski-Górecki
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On Mon, Nov 28, 2022 at 01:40:31AM -0500, Demi Marie Obenour wrote:
> On Mon, Nov 28, 2022 at 04:02:50AM +0100, Marek Marczykowski-Górecki wrote:
> > Hello,
> > 
> > Since some time already, new repositories in QubesOS github org had
> > 'main' as default branch. I've just switched default branch to 'main'
> > for existing repositories too.
> > For transitional period, both 'master' and 'main' branches will exist,
> > and will be kept in sync (there is a bot for that). So, all repo clones,
> > builder.conf files etc should remain valid. Existing pull requests
> > should remain unaffected too.
> > My current plan is to keep this transitional period at least until R4.1
> > EOL. The reasoning is that any existing build/devel environment for
> > R4.1 should remain functional as long as R4.1 is supported. But any new
> > environment for R4.2 should use new branch names already.
> > Example R4.2's builder.conf qubes-builder (v1) is updated already. The
> > one for qubes-builderv2 will be updated shortly.
> 
> Does not work for me:
> 
> -> Updating sources for builder-github...
> --> Fetching from origin main...
> fatal: couldn't find remote ref main
> make: *** [Makefile:224: builder-github.get-sources] Error 1

I went through repos list again, hopefully haven't missed anything
important this time...

- -- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
-BEGIN PGP SIGNATURE-

iQEzBAEBCAAdFiEEhrpukzGPukRmQqkK24/THMrX1ywFAmOGK0oACgkQ24/THMrX
1yxWCgf7BmLvUwbMncw1/57OA3h3ZkWpgV/kWfd4gP6U89wOu776ENz6Q6Qdz9hw
TtrfQZAnHugODy/uNCqpWxTMj3idWdojWLNxBt5DoACloqhUy9AAQj79wU7YupNU
FIBLqE350Oe5jmHJGGrzZKz3Ln0MVR+xxy/hIo9F/4ZV3jqCivR+j8KSoTyhgl80
7lF1NxNG54zJ3lHD0ZH88d0GK+aWuWO2mleaj2Cw2iSUbl+gIFM0jkRNoNcQzjIN
ZkCaAtILvpqdDsvK7+fKetHCfKMrY7w/vHElSNUtbZiaGQySZ08JAQahiqVRqGO6
0ixTrQFJF3s04hTekWzgqBN4+iIocg==
=rLX1
-END PGP SIGNATURE-

-- 
You received this message because you are subscribed to the Google Groups 
"qubes-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to qubes-devel+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/qubes-devel/Y4YrSzc2ee4TPD3M%40mail-itl.