Default branch switched to 'main'

11 views
Skip to first unread message

Marek Marczykowski-Górecki

unread,
Nov 27, 2022, 10:03:00 PM11/27/22
to qubes-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

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.


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

iQEzBAEBCAAdFiEEhrpukzGPukRmQqkK24/THMrX1ywFAmOEJNkACgkQ24/THMrX
1yxExgf/TyFKg3F70t1jD+qGjjfqD4/vPhJeCr5DqnTs50/qDwIH3tooE62+Wtl+
DJYQwBxKaRMhErE5Sj0My0AWMGSvYMRgHjlDRQA4vOKu7FMtGQIJyZWXmf7WwUiv
rnhCKa5M16Kj3Ne3Jwulg9U8Yjhqr2L9633pLkuOotCQxKeZCyBXlMc1dTK6DzZH
wH5Smgh5x2AY5VX4KeSg5HUu/rtRFjxXu4BvpmuwnH8+yg3hoI7dgCTvN56HyooT
0dQWvp5Bc8Xq91rbaNRBiyyUTViGbX3nF26N/zjCvorPChxnJATmJR2YxYk4LQk9
Bq2YlY2176Uz6OeT9/TjLTY/nmVkqA==
=J6iF
-----END PGP SIGNATURE-----

Demi Marie Obenour

unread,
Nov 28, 2022, 1:40:39 AM11/28/22
to Marek Marczykowski-Górecki, qubes-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

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
- --
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEdodNnxM2uiJZBxxxsoi1X/+cIsEFAmOEV98ACgkQsoi1X/+c
IsG9kQ//QhmUNVmJ+eiuse86Gz6hR8b66ZedtWTr6IxJ/aggwmnslc7pedROBsrz
18ZbNvill/GOtJMzMx7895SoSc1BlYVkKONhshQC3FGmySF6mU8+VOTDaUCU/te2
5iRUkMw8ItfBKkw7eCKwXea4tB2PITI4CTjmB1dUedNR0VcDCjAetb3Moss3zzmG
OQNX/2BGqQUZc3J5rCGCgI1YSf5hkkGUfSvbb4SLdrglQd2urMWI59zq0oCyaGAZ
Q9z8q2A4kC8yy8y3bdStTMOfgdDN5NSpykjQRc9sYiE3zt7zHhZEUCIJP4YJPH19
uY+6k4P7XqS+0YKpBnceXYdyuhvTjNoqJgcnd1Dkb6L9A58bPnvmBMERrWj1QZ2h
PvO5uCAlgYPaktsVj0pruxhINOHx6hmoC+LEFvYm51Y10WlMx+wzC1aTT2W3enV7
bNRN7SL/Wl4UzErKjlit/JATxkvqQSa4NuVY/GzSic1zZmsD0TQZV8Qc4O2fU77f
Lnx+B4FdgVU8ZAfZwu/nhDOi3Zxws0B4B51jbRVIe4MjscMQyOB36Nys1j5jR7up
BBsKzMQrq1B5hah7E94a4hkdZNZPWh7t6vOd4aUP1wODTwI+KM3XDOOq46QW+NYM
jVmkAJtstbb1+8oIbl5GDqDVJReZ2/BQ9hNGCUW9uAAVRTqXykk=
=PDde
-----END PGP SIGNATURE-----

Marek Marczykowski-Górecki

unread,
Nov 29, 2022, 10:54:56 AM11/29/22
to Demi Marie Obenour, qubes-devel
-----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-----

Demi Marie Obenour

unread,
Nov 29, 2022, 5:51:26 PM11/29/22
to Marek Marczykowski-Górecki, qubes-devel
-----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-----
Reply all
Reply to author
Forward
0 new messages