Skip to content

Conversation

hds
Copy link
Contributor

@hds hds commented Jun 3, 2025

Motivation

The new main branch is forked from the v0.1.x branch. It will be
made the default branch and going forward we will merge PRs to this
branch first (and then forward port to a new v0.2.x branch forked from
master).

It looks like Netlify jobs weren't running on the v0.1.x branch, and so
there were quite a few errors in the docs on that branch (which isn't great
because those are the ones that get published to docs.rs).

Solution

Separate to this PR, we've enabled Netlify on the main branch, and this
change fixes all the errors that were present in the docs.

This change sets the GitHub actions to run on the main branch instead
of v0.1.x. It also adds some text in the root README.md which
describes the branch set-up.

Refs: #3294

The new `main` branch is forked from the `v0.1.x` branch. It will be
made the default branch and going forward we will merge PRs to this
branch first (and then forward port to a new `v0.2.x` branch forked from
`master`).

This change sets the GitHub actions to run on the `main` branch instead
of `v0.1.x`. It also adds some text in the root README.md which
describes the branch set-up.

Refs: #3294
@hds hds requested review from hawkw and a team as code owners June 3, 2025 12:49
@kaffarell
Copy link
Contributor

Not so important, but maybe we can also change the links in the README? So changing the badge from master to main and maybe remove the "Documentation (master branch)" link as it's broken anyway.

@hds hds requested a review from yaahc as a code owner June 4, 2025 08:29
@hds
Copy link
Contributor Author

hds commented Jun 4, 2025

@kaffarell Good call. I've replaced references to assets in master with main instead. I removed the text master docs link from the main README, but kept all the others, just renamed them from master to v0.2.x and fixed the links (they should go to tracing.rs instead of tracing-rs.netlify.com).

@hds hds force-pushed the hds/switch-to-main branch from 5dc5edc to 90ed517 Compare June 4, 2025 13:51
@hds hds changed the title chore: switch default branch to main fix docs and enable CI on main branch Jun 5, 2025
@hds hds merged commit c01d4fd into main Jun 5, 2025
56 checks passed
@hds hds deleted the hds/switch-to-main branch June 5, 2025 08:15
@djc
Copy link
Contributor

djc commented Jun 5, 2025

@hds thanks for doing the legwork on this!

hds added a commit that referenced this pull request Jun 6, 2025
## Motivation

The new `main` branch is forked from the `v0.1.x` branch. It will be
made the default branch and going forward we will merge PRs to this
branch first (and then forward port to a new `v0.2.x` branch forked from
`master`).

It looks like Netlify jobs weren't running on the `v0.1.x` branch, and so
there were quite a few errors in the docs on that branch (which isn't great
because those are the ones that get published to docs.rs).

## Solution

Separate to this PR, we've enabled Netlify on the `main` branch, and this
change fixes all the errors that were present in the docs.

This change sets the GitHub actions to run on the `main` branch instead
of `v0.1.x`. It also adds some text in the root README.md which
describes the branch set-up.

Refs: #3294
hds added a commit that referenced this pull request Jun 6, 2025
Port #3295 to the (now legacy) `v0.1.x` branch. This is to fix the
Netlify jobs which are now running here.
hds added a commit that referenced this pull request Jun 9, 2025
Port #3295 to the (now legacy) `v0.1.x` branch. This is to fix the
Netlify jobs which are now running here.

Explain that `v0.1.x` is no longer in use and direct users to `main` for
the released crates and `v0.2.x` for the pre-release versions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants