search

twelve-of-code-official / website

The source code for the Twelve of Code website
https://mesure.x10.mx/twelve-of-code
GNU General Public License v3.0
0 stars 0 forks source link

Main branch after 1.0.0 releases #79

Closed BeepBot99 closed 7 months ago

BeepBot99 commented 7 months ago

Issue Contents

When developing for 1.1.0 after 1.0.0 releases, we can't push to the main branch because then people who are doing the challenges would see changes. After it releases, instead, there should be a production branch. All edits are made to the main branch, but the website is on the production branch. The main branch is merged into the production branch only when 1.1.0 is released. That way, people will only see the changes when they should, and they won't be doing the challenges while it is being developed.

BeepBot99 commented 7 months ago

I can do this.

Mesure73L commented 7 months ago

Can we discuss this first?

Mesure73L commented 7 months ago

When developing for 1.1.0 after 1.0.0 releases, we can't push to the main branch because then people who are doing the challenges would see changes.

What do you mean by the people who are doing the challenges would see changes?

After it releases, instead, there should be a production branch. All edits are made to the main branch, but the website is on the production branch. The main branch is merged into the production branch only when 1.1.0 is released. That way, people will only see the changes when they should, and they won't be doing the challenges while it is being developed.

I don't understand this.

BeepBot99 commented 7 months ago

[!IMPORTANT] First of all, note what milestone this is in. It is not until March.

Explanation

The main branch is what is seen on the website. If, in between March and August, someone is completing a challenge on Twelve of Code, and we are pushing developmental updates to the main branch, they will see it. Therefore, after 1.0.0 releases, we should have a production branch which is what will be pushed to the website instead of the main branch. When we release an update or bugfix, will will merge the main branch into the production branch, and then and only then wil the changes go onto the website.

Mesure73L commented 7 months ago

Why not the production branch for development (I can set up pages on it) and main for what is on the website? I think that makes more sense

BeepBot99 commented 7 months ago

No, then it would be called staging. production means what is what the user sees, although the naming is confusing. But yes, you can create a branch called staging after 1.0.0 releases.

BeepBot99 commented 7 months ago

I can set up pages on it

What do you mean? What pages?

Mesure73L commented 7 months ago

No, then it would be called staging. production means what is what the user sees, although the naming is confusing. But yes, you can create a branch called staging after 1.0.0 releases.

Let's just use a staging branch

I can set up pages on it

What do you mean? What pages?

Imagine not knowing what GitHub pages are

BeepBot99 commented 7 months ago

Oh. It is confusing when you say things such as pages and hub, because that is not what they are called without context. You do not need to set up pages, although you may if you want to. The reason there is usually a production branch instead of a staging one is because when creating a new branch, by default, it forks from main. If main is the production branch, you would want to fork from staging instead, and you would have to change it manually every single time.

Mesure73L commented 7 months ago

Changed this to low priority, high priority should be for things that are urgent. We have a lot of time for this.

BeepBot99 commented 7 months ago

No, by high priority, I meant high priority after 1.0.0 releases.

Mesure73L commented 7 months ago

…which is not high priority right now

BeepBot99 commented 7 months ago

Completed.