Skip to content

Commit

Permalink
chore: Rename the default branch from master to main (#2750)
Browse files Browse the repository at this point in the history
  • Loading branch information
kdy1 authored Nov 15, 2021
1 parent 015b258 commit 6b70fb5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
max-items-in-chart: 250

- name: Deploy
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
uses: JamesIves/github-pages-deploy-action@4.1.0
with:
token: ${{ secrets.GH_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ jobs:
deploy-docs:
name: Docs
runs-on: ubuntu-latest
# if: github.ref == 'refs/heads/master'
# if: github.ref == 'refs/heads/main'
# needs:
# - test
steps:
Expand All @@ -282,7 +282,7 @@ jobs:
echo 'rustdoc.swc.rs' > target/doc/CNAME
- name: Deploy
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
uses: JamesIves/github-pages-deploy-action@4.1.0
with:
token: ${{ secrets.GH_TOKEN }}
Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ bring those changes into the source repository. This process is partly
automated: Pull requests are made against SWC's repository, tested and
reviewed. Once a change is approved to be merged, a friendly bot merges the
changes into an internal branch, runs the full test-suite on that branch
and only then merges into master. This ensures that SWC passes the test-suite at all times.
and only then merges into main. This ensures that SWC passes the test-suite at all times.

Steps to get started:

- Fork SWC and create a branch from master for the issue you are working on.
- Fork SWC and create a branch from main for the issue you are working on.
- Make sure you have the `make` utility installed, along with Rust and C/C++
compilers.
- Please adhere to the code style that you see around the location you are
Expand All @@ -61,7 +61,7 @@ Steps to get started:
- All code changes are expected to comply with the formatting suggested by `rustfmt`.
You can use `rustup component add --toolchain nightly rustfmt-preview` to install `rustfmt` and use
`rustfmt +nightly --unstable-features --skip-children` on the changed files to automatically format your code.
- Push your commits to GitHub and create a pull request against the `swc-project/swc` `master` branch.
- Push your commits to GitHub and create a pull request against the `swc-project/swc` `main` branch.

## Getting your development environment set up

Expand Down Expand Up @@ -104,7 +104,7 @@ The review-process will make sure that the proposed changes are sound.
Please give the assigned reviewer sufficient time, especially during weekends.
If you don't get a reply, you may ping the core developers on [Discord][discord].
A merge of SWC's master-branch and your changes is immediately queued
A merge of SWC's main-branch and your changes is immediately queued
to be tested after the pull request is made. In case unforeseen
problems are discovered during this step (e.g. a failure on a platform you
originally did not develop on), you may ask for guidance. Push additional
Expand All @@ -116,11 +116,11 @@ the code was previously reviewed. Large or tricky changes may require several
passes of review and changes.

Once the reviewer approves your pull request, a friendly bot picks it up
and merges it into the SWC `master` branch.
and merges it into the SWC `main` branch.

## Contributing to the documentation

The SWC documentation can be found at [`swc-project/website`](https://github.com/swc-project/website/tree/master/pages/docs).
The SWC documentation can be found at [`swc-project/website`](https://github.com/swc-project/website/tree/main/pages/docs).

At the bottom of each page on [swc.rs](https://swc.rs) there is a `Edit this page on GitHub` button that immediately links to the right page to edit.

Expand Down Expand Up @@ -166,7 +166,7 @@ adding labels to triage issues:
[e-mentor]: https://github.com/swc-project/swc/labels/E-mentor
[code of conduct]: https://www.rust-lang.org/conduct.html
[discord]: https://discord.gg/2ZhncgMt
[`testing/lib.rs`]: https://github.com/swc-project/swc/blob/master/testing/src/lib.rs
[`testing/lib.rs`]: https://github.com/swc-project/swc/blob/main/testing/src/lib.rs
[irlo]: https://internals.rust-lang.org/
[subcommands]: https://doc.rust-lang.org/cargo/reference/external-tools.html#custom-subcommands
[issue-tracker]: https://github.com/swc-project/swc/issues

0 comments on commit 6b70fb5

Please sign in to comment.