Changing master branch to main in Quarkus repositories

[Guillaume Smet]

Hi,

We will change the main branch of the various Quarkus repositories from `master` to `main` in the coming weeks.

We will start with the quickstarts and main repo either before end of week or beginning of next week and then we will pursue with the more involved ones like the whole Quarkiverse.

Hopefully, we will be able to reduce the disruption while doing so as GitHub introduced tools that should install proper redirections.

Just wanted to give you all a heads up. I will send the updates in this thread.

--

Guillaume

[Guillaume Smet]

I just renamed the master branch of the quarkus-quickstarts repo.

GitHub says to apply these commands to your repo:

git branch -m master main
git fetch origin

git branch -u origin/main main

Personally, I had to change them to the following as I use `upstream` for the original repo:

git branch -m master main
git fetch upstream

git branch -u upstream/main main

There's a good chance you will need to do the same thing for your fork.

[Georgios Andrianakis]

Works like a charm

--
You received this message because you are subscribed to the Google Groups "Quarkus Development mailing list" group.
To unsubscribe from this group and stop receiving emails from it, send an email to quarkus-dev...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CALt0%2Bo-cVGgN2LNx6UMDDx29O1EqcyAzrh6-Gpzu7m-JSQtP6Q%40mail.gmail.com.

[Sanne Grinovero]

On Thu, 11 Mar 2021 at 12:36, Georgios Andrianakis <gand...@redhat.com> wrote:

Works like a charm

+1

No problems

Thanks!

 

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CALeTM-nwVKJtoBYTq6aeyDP2kcsTAzt4G4JyJBNJEV7nLDjEOw%40mail.gmail.com.

[Guillaume Smet]

Just a heads up that I will do the change on the main Quarkus repository on Friday late afternoon Paris time.

--

Guillaume

[Jason Greene]

BTW in case anyone hasn’t heard the news and is wondering why this is happening. There is a mass community ecosystem move to this new convention underway:

https://github.com/github/renaming

On Mar 11, 2021, at 8:26 AM, Guillaume Smet <guillau...@gmail.com> wrote:



To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CALt0%2Bo_JYK1ZUUtMxtB37Gcnxvk_jdyn_-2qTqpTrW3WhTfbSA%40mail.gmail.com.

[Robbie Gemmell]

I've raised https://github.com/quarkusio/quarkusio.github.io/pull/927
to update quickstart links to fix some breakages (for archive links)
and avoid some redirects.

[Guillaume Smet]

Yeah, I'm going to migrate the main repository now and fix all that.

[Guillaume Smet]

The branch has been renamed for the main repo.

I will now go through all the code/CI workflows and so on.

[Guillaume Smet]

OK, I think I'm done... I checked everything twice, also checked all the external links to see if they already moved to a new branch or not.

Unfortunately, I'm unable to create a PR (probably too many changes), I have the GitHub Unicorn every time I try to create the PR. I will wait for CI in my fork and then I'll push directly to main.

What you need to do (and that for every repo I will mention after that):

- go to your fork, you will have a nice popup saying that the branch of the upstream repo has been renamed, just click the Branch settings link and update the branch master to main (there's a small pencil at the right of the master branch)

- then, if you follow the conventions I use (i.e. upstream/origin), you can execute:

git branch -m master main
git fetch origin
git branch -u origin/main main

git fetch upstream
git branch -u upstream/main main

(and adapt it if you're using a different convention)

Some notes, once we migrate the following repo, we need to update the doc in the main repo:

https://github.com/quarkusio/quarkus-ecosystem-ci/ -> @Georgios Andrianakis can we coordinate on this?

https://github.com/quarkusio/quarkus-images/ -> @clement escoffier can we coordinate on this?

https://github.com/quarkiverse/quarkiverse-docs/ -> @George Gastaldi can we coordinate on this?

There are still a few problematic occurrences

docs/src/main/asciidoc/datasource.adoc

-> master|slave for MariaDB and MySQL JDBC URLs - I think they changed things for MySQL as we had to change a few class names here when we upgraded but I don't know what the new URLs are. For MariaDB, I don't think they did it.

Then there are a few other things:

- Keycloak realm

- Kubernetes master URL

- KMS

- Vault master API

but for these ones, I think we will need to wait for the vocabulary of these projects to evolve.

--

Guillaume

[Georgios Andrianakis]

On Fri, Mar 12, 2021, 20:22 Guillaume Smet <guillau...@gmail.com> wrote:

OK, I think I'm done... I checked everything twice, also checked all the external links to see if they already moved to a new branch or not.

Heroic work!

Unfortunately, I'm unable to create a PR (probably too many changes), I have the GitHub Unicorn every time I try to create the PR. I will wait for CI in my fork and then I'll push directly to main.

What you need to do (and that for every repo I will mention after that):

- go to your fork, you will have a nice popup saying that the branch of the upstream repo has been renamed, just click the Branch settings link and update the branch master to main (there's a small pencil at the right of the master branch)

- then, if you follow the conventions I use (i.e. upstream/origin), you can execute:

git branch -m master main
git fetch origin
git branch -u origin/main main
git fetch upstream
git branch -u upstream/main main

(and adapt it if you're using a different convention)

Some notes, once we migrate the following repo, we need to update the doc in the main repo:

https://github.com/quarkusio/quarkus-ecosystem-ci/ -> @Georgios Andrianakis can we coordinate on this?

Sure yeah

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CALt0%2Bo_hzKitBmCiYAUzdGpUvjLk27ytVuD_aFzkFqPCvKsrtA%40mail.gmail.com.

[George Gastaldi]

Splendid work! Sure, let's coordinate on the quarkiverse-docs repo. Ping me in Zulip

[Bernhard Lutzmann]

Guillaume,

there seems to be a major GitHub outage:

https://www.githubstatus.com/

Regards,

Bernhard

[Guillaume Smet]

I also renamed the main branches of:

- gizmo

- quarkus-http

- quarkus-security

- quarkus-platform

So if you're working on the main project, things should be consistent. Just follow the instructions I gave earlier and you should be all set.

As for the rest, we will need more coordination.

BTW, GitHub is all broken right now so will create/merge the additional PRs later tonight or tomorrow.

[Guillaume Smet]

Was able to create the PR: https://github.com/quarkusio/quarkus/pull/15690 .

[Guillaume Smet]

I merged the big PR this morning.

[Falko]

The switch went well for my fork, thanks for the git commands!

I think this is also a good opportunity to push to your fork's main, for consistency and to refresh Maven repo cache etc.

PS: It's easy to miss, but there is a suggestion in CONTRIBUTING.md to push to your main every now and then: https://github.com/quarkusio/quarkus/blob/main/CONTRIBUTING.md#continuous-integration (last sentence)

[Andy Damevin]

I've just switched https://github.com/quarkusio/code.quarkus.io

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/1a6d3d5c-9002-4d45-b92b-c0e641ebc75cn%40googlegroups.com.

--

Andy Damevin

[Erin Schnabel]

The micrometer registry repo in quarkiverse has brrn switched.

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CAE_u_P5eEi5bVAbbq%3DAWjteUHVxZ797WFvL544250-h8UiZu2w%40mail.gmail.com.

--

Thanks,

Erin

 

------
Erin Schnabel <ebul...@redhat.com>

@ebullientworks

[clement escoffier]

Hello,

I did quarkus-images yesterday. 

Clement

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CAJwjk9z%2BjmMu2UGXbTZqXa15td11MPJ7RyCstypAf02m7_FVwQ%40mail.gmail.com.

[George Gastaldi]

Hello all!

We want to rename the https://github.com/quarkusio/quarkus-ecosystem-ci default branch from `master` to `main`, however by doing so, this might break the builds for a CI participant unless a small update to their `.github/workflows/quarkus-snapshot.yaml` files is performed. The change is simple and should work with your current build as of today:

We kindly ask the extension maintainers to remove the `ref` attribute in their `quarkus-snapshot.yaml` files. See https://github.com/quarkiverse/quarkus-prettytime/commit/298127569dd5f3e89bf3c6d07ee8e4b3fcf9cd2e if you need help.

New extensions generated through the plugin already have this change. If your action YAML does not have the `ref` you're all set :)

We're planning to change the branch name on May 3rd, so make sure to perform that change in your repositories by then.

Thank you!

[Max Andersen]

Any reasons why we don't just do a bulk search and replace and submit PRs for each repo ?

/max

--

You received this message because you are subscribed to the Google Groups "Quarkus Development mailing list" group.
To unsubscribe from this group and stop receiving emails from it, send an email to quarkus-dev...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/c6ce47a5-d064-4ac7-bda7-011d818ac4fcn%40googlegroups.com.

[George Gastaldi]

Looks like we have a volunteer to work on that? 😀

[Max Rydahl Andersen]

sure. 

https://github.com/quarkusio/quarkus/issues/16601

issue with the info, steps i made and PRs submitted.

I hope i got it right :)

/max

--

/max

https://about.me/maxandersen

[George Gastaldi]

The branch was renamed. If you´re a Quarkiverse maintainer, make sure your PR (created from https://github.com/quarkusio/quarkus/issues/16601) is merged, otherwise your Ecosystem CI builds will fail. 

If you have the quarkus-ecosystem-ci repository cloned locally, you need to run the following commands:

git branch -m master main 

git fetch origin 

git branch -u origin/main main 

git remote set-head origin -a

[Antonio Goncalves]

Hi,

I just went to https://code.quarkus.io and generated an application by pushing it to GitHub. It created it into a branch called master (not main) :

https://github.com/agoncal/code-with-quarkus

I don't know where this setting happens, if it's on https://code.quarkus.io side or on my side (but I couldn't see any settings).

Any idea ?

--

You received this message because you are subscribed to the Google Groups "Quarkus Development mailing list" group.
To unsubscribe from this group and stop receiving emails from it, send an email to quarkus-dev...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/483889e0-463a-4fb9-8daa-1dd9a576013an%40googlegroups.com.

--

Antonio Goncalves 
Contractor, Java Champion and Pluralsight author

Blog | Twitter | LinkedIn | Author | Pluralsight | Devoxx France | Voxxed Microservices

[Jean-Francois Maury]

I opened an issue a while ago I think it has been fixed but deploy is to happen 

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CAKawoOZRX3psgPH6TYYNjO5%2BnBqW4xtnYgzjo%2BE2At%3DzkRpTwA%40mail.gmail.com.

[Bernhard]

You can set the default branch in your GitHub settings:

https://github.com/settings/repositories

[Jean-Francois Maury]

FTR: https://github.com/quarkusio/code.quarkus.io/issues/447

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/9a23b18b-d90b-4e83-bd34-e059b54a6476n%40googlegroups.com.

--

Jeff Maury

Manager, DevTools

Red Hat EMEA

jma...@redhat.com   

@RedHat   Red Hat   Red Hat

[Paul Robinson]

Hi All,

Just picking this up again. I see many people have been doing a great job migrating their Quarkus repos to use main instead of master. However, we still have a few more to go:

ja.quarkus.io
jbang-catalog
quarkus-spring-boot-api
quarkus-spring-data-api
quarkus-workshops
quarkus-spring-api
quarkus-spring-security-api
qson
quarkus-kafka-broker-image
resteasy-reactive-testsuite

Can I get volunteers to update those please?

Thanks!

Paul.

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CAG6Rg%2Bn-%2B3CXf_HBbDNh-vUf%2BvbWPLXN2ecKO%3DSgR-xxXzFXtQ%40mail.gmail.com.

--

Paul Robinson

Senior Engineering Manager

Eclipse MicroProfile & Quarkus

He/Him/His

Red Hat

Red Hat respects your work life balance. Therefore there is no need to answer this email out of your office hours.

[George Gastaldi]

I updated the jbang-catalog repository

You received this message because you are subscribed to a topic in the Google Groups "Quarkus Development mailing list" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/quarkus-dev/9pgWBYl6IqY/unsubscribe.
To unsubscribe from this group and all its topics, send an email to quarkus-dev...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CAL%2BvToZ2yrKGF3_EYrCruo6nEuG0Hd01f6GYM9c4ncO6qpny%2BA%40mail.gmail.com.

[Georgios Andrianakis]

I'll do the Spring and RESTEasy Reactive related repos on Monday

To view this discussion on the web visit https://groups.google.com/d/msgid/quarkus-dev/CAMmsnJg40PazHHUV2Xp8f_QC3h7sEDWADOsd5KqJkNiGgSCvCg%40mail.gmail.com.

[Georgios Andrianakis]

It turns out that I don't have the karma to rename the branches

[Guillaume Smet]

On Mon, Sep 6, 2021 at 12:35 PM Georgios Andrianakis <gand...@redhat.com> wrote:

It turns out that I don't have the karma to rename the branches

Done for the RR TCK and the Spring API projects. I'll let you pass the info to the appropriate persons.

[Georgios Andrianakis]

Thanks!