diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 4f936727f757..5ec39bb78a13 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -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 }} diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 02fbd2bf8916..fe334b1f6ae3 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -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: @@ -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 }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f8bee3cbaa8e..04c21ee61d6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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 @@ -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 @@ -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. @@ -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