From abd7f868889fde32e19364a652eea67b7ee33bc7 Mon Sep 17 00:00:00 2001 From: Claudia Meadows Date: Tue, 24 Sep 2024 20:59:33 -0700 Subject: [PATCH] next -> main --- .github/workflows/merge.yml | 4 ++-- .github/workflows/pr.yml | 6 +++--- .github/workflows/push-main.yml | 2 -- .github/workflows/rollback.yml | 2 +- .../workflows/{test-next-push.yml => test-main-push.yml} | 8 ++++---- .github/workflows/test.yml | 2 +- README.md | 4 ++-- docs/contributing.md | 2 +- docs/releasing.md | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) rename .github/workflows/{test-next-push.yml => test-main-push.yml} (82%) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index ab508c9c2..bf6c3e8e2 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -15,13 +15,13 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: next + ref: main - uses: actions/setup-node@v4 with: node-version: 20 - run: npm ci - run: npm run build - - run: npx pr-release merge --target release --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change + - run: npx pr-release merge --target release --source main --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b637c755a..8dd82e63a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -2,7 +2,7 @@ name: pr on: push: - branches: [ next ] + branches: [ main ] workflow_dispatch: @@ -19,7 +19,7 @@ jobs: node-version: 20 - run: npm ci - run: npm run build - - run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change + - run: npx pr-release pr --verbose --target release --source main --compact --verbose --minimize-semver-change env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} # The following will publish a prerelease to npm @@ -27,5 +27,5 @@ jobs: name: Setup NPM Auth env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change + - run: npx pr-release infer-prerelease --preid=next --target release --source main --verbose --publish --minimize-semver-change name: Publish diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml index 5bf122fb9..21f3ab693 100644 --- a/.github/workflows/push-main.yml +++ b/.github/workflows/push-main.yml @@ -9,5 +9,3 @@ jobs: comment: uses: MithrilJS/infra/.github/workflows/reject-pr.yml@main secrets: inherit - with: - correct_branch: next diff --git a/.github/workflows/rollback.yml b/.github/workflows/rollback.yml index 1dbe32e57..fe6dc64a8 100644 --- a/.github/workflows/rollback.yml +++ b/.github/workflows/rollback.yml @@ -16,6 +16,6 @@ jobs: node-version: 20 - run: npm ci - run: npm run build - - run: npx pr-release rollback --verbose --target release --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md + - run: npx pr-release rollback --verbose --target release --source main --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/test-next-push.yml b/.github/workflows/test-main-push.yml similarity index 82% rename from .github/workflows/test-next-push.yml rename to .github/workflows/test-main-push.yml index 5323b42c4..f8f7bb1b1 100644 --- a/.github/workflows/test-next-push.yml +++ b/.github/workflows/test-main-push.yml @@ -1,8 +1,8 @@ -name: test-next-push +name: test-main-push on: push: - branches: [ next ] + branches: [ main ] workflow_dispatch: concurrency: prr:pre-release @@ -21,7 +21,7 @@ jobs: node-version: 20 - run: npm ci - run: npm run build - - run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change + - run: npx pr-release pr --verbose --target release --source main --compact --verbose --minimize-semver-change env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} # The following will publish a prerelease to npm @@ -29,5 +29,5 @@ jobs: name: Setup NPM Auth env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change + - run: npx pr-release infer-prerelease --preid=next --target release --source main --verbose --publish --minimize-semver-change name: Publish diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d769ea60..1ded9a673 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: test on: pull_request_target: - branches: [ next ] + branches: [ main ] workflow_dispatch: workflow_call: diff --git a/README.md b/README.md index 8b17c4889..0df92e0b0 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Mithril.js [![npm Version](https://img.shields.io/npm/v/mithril.svg)](https://www.npmjs.com/package/mithril)   -[![License](https://img.shields.io/npm/l/mithril.svg)](https://github.com/MithrilJS/mithril.js/blob/next/LICENSE)   +[![License](https://img.shields.io/npm/l/mithril.svg)](https://github.com/MithrilJS/mithril.js/blob/main/LICENSE)   [![npm Downloads](https://img.shields.io/npm/dm/mithril.svg)](https://www.npmjs.com/package/mithril)   -[![Build Status](https://img.shields.io/github/actions/workflow/status/MithrilJS/mithril.js/.github%2Fworkflows%2Ftest-next-push.yml)](https://www.npmjs.com/package/mithril)   +[![Build Status](https://img.shields.io/github/actions/workflow/status/MithrilJS/mithril.js/.github%2Fworkflows%2Ftest-main-push.yml)](https://www.npmjs.com/package/mithril)   [![Donate at OpenCollective](https://img.shields.io/opencollective/all/mithriljs.svg?colorB=brightgreen)](https://opencollective.com/mithriljs)   [![Zulip, join chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://mithril.zulipchat.com/) diff --git a/docs/contributing.md b/docs/contributing.md index d6b7c74ba..04a07f5db 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -38,7 +38,7 @@ To send a pull request: - fork the repo (button at the top right in GitHub) - clone the forked repo to your computer (green button in GitHub) -- Switch to the `next` branch (run `git checkout next`) +- Switch to the `main` branch (run `git checkout main`) - create a feature branch (run `git checkout -b the-feature-branch-name`) - make your changes - run the tests (run `npm test`) diff --git a/docs/releasing.md b/docs/releasing.md index 1bdb2be71..70bb2b806 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -16,7 +16,7 @@ pr-release handles the following: ## For contributors -Contributors should create their feature branch targetting the default branch `next`. When this branch is merged `pr-release` will either generate or update a release PR from `next` to `release`. +Contributors should create their feature branch targetting the default branch `main`. When this branch is merged `pr-release` will either generate or update a release PR from `main` to `release`. The description and title will be managed by [pr-release], including the semver version.