diff --git a/.github/workflows/sync-master-main.yaml b/.github/workflows/sync-master-main.yaml deleted file mode 100644 index 3ffb6932a25..00000000000 --- a/.github/workflows/sync-master-main.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: sync-master-main - -on: - push: - branches: - - master - -permissions: - contents: read - -jobs: - sync: - permissions: - contents: write - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: update remote branch main - run: | - # overrides the remote branch (origin:github) `main` - git push origin --force master:main diff --git a/LOTUS_RELEASE_FLOW.md b/LOTUS_RELEASE_FLOW.md index c0deca840f8..f5a0b8d141b 100644 --- a/LOTUS_RELEASE_FLOW.md +++ b/LOTUS_RELEASE_FLOW.md @@ -22,6 +22,7 @@ - [Why do we call it "Lotus Node"?](#why-do-we-call-it-lotus-node) - [Why isn't Lotus Miner released more frequently?](#why-isnt-lotus-miner-released-more-frequently) - [Why is the `releases` branch deprecated and what are alternatives?](#why-is-the-releases-branch-deprecated-and-what-are-alternatives) + - [Why does Lotus still use a `master` branch instead of `main`?](#why-does-lotus-still-use-a-master-branch-instead-of-main) - [Related Items](#related-items) ## Purpose @@ -153,6 +154,9 @@ That said, one can still programmatically get the latest release based on the [B * Lotus Node: `git tag -l 'v*' | grep -v "-" | sort -V -r | head -n 1` * Lotus Miner: `git tag -l 'miner/v*' | grep -v "-" | sort -V -r | head -n 1` +### Why does Lotus still use a `master` branch instead of `main`? +There was a [push in 202109](https://github.com/filecoin-project/lotus/issues/7356) on changing the default branch to `main` from `master` for good reason. 3 years later though, the migration was never completed and `master` has ossified 😔. The effort's failure was acknowledged and commented on in the issue above in 202409. + ## Related Items 1. [Release Issue template](https://github.com/filecoin-project/lotus/blob/master/documentation/misc/RELEASE_ISSUE_TEMPLATE.md)