diff options
author | Luca Casonato <lucacasonato@yahoo.com> | 2021-02-19 15:58:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-19 15:58:19 +0100 |
commit | 4f80587d26891f783b1a7a46b0f3273def49cd6e (patch) | |
tree | e47ed14559f7af33de7e8c561438fa00b2b0b4db | |
parent | e3fe4be83b7424f5530430f1b462f07a71e55b65 (diff) |
chore: rename default branch to main (#9503)
-rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 3 | ||||
-rw-r--r-- | .github/workflows/ci.yml | 18 | ||||
-rw-r--r-- | README.md | 4 | ||||
-rw-r--r-- | core/README.md | 6 | ||||
-rw-r--r-- | docs/contributing/building_from_source.md | 2 | ||||
-rw-r--r-- | docs/contributing/release_schedule.md | 2 | ||||
-rw-r--r-- | docs/runtime.md | 2 | ||||
-rw-r--r-- | docs/runtime/stability.md | 2 | ||||
-rw-r--r-- | docs/standard_library.md | 4 | ||||
-rwxr-xr-x | tools/wpt.ts | 2 |
10 files changed, 22 insertions, 23 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d21fdb35c..a75ff44f7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,5 @@ <!-- -Before submitting a PR, please read -https://github.com/denoland/deno/blob/master/docs/contributing.md +Before submitting a PR, please read http://deno.land/manual/contributing 1. Give the PR a descriptive title. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cd8ca8ed..843a98b02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,13 +35,13 @@ jobs: - os: ubuntu-18.04 kind: test_release - # Always run master branch builds to completion. This allows the cache to + # Always run main branch builds to completion. This allows the cache to # stay mostly up-to-date in situations where a single job fails due to # e.g. a flaky test. # Don't fast-fail on tag build because publishing binaries shouldn't be # prevented if if any of the stages fails (which can be a false negative). fail-fast: ${{ github.event_name == 'pull_request' || (github.ref != - 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/')) }} + 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/')) }} env: CARGO_INCREMENTAL: 0 @@ -55,7 +55,7 @@ jobs: - name: Clone repository uses: actions/checkout@v2 with: - # Use depth > 1, because sometimes we need to rebuild master and if + # Use depth > 1, because sometimes we need to rebuild main and if # other commits have landed it will become impossible to rebuild if # the checkout is too shallow. fetch-depth: 5 @@ -120,7 +120,7 @@ jobs: runner.os != 'Windows' && matrix.kind == 'test_release' && github.repository == 'denoland/deno' && - (github.ref == 'refs/heads/master' || + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) uses: google-github-actions/setup-gcloud@master with: @@ -133,7 +133,7 @@ jobs: runner.os == 'Windows' && matrix.kind == 'test_release' && github.repository == 'denoland/deno' && - (github.ref == 'refs/heads/master' || + (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) uses: google-github-actions/setup-gcloud@master env: @@ -147,7 +147,7 @@ jobs: if: | matrix.kind == 'test_release' && github.repository == 'denoland/deno' && - github.ref == 'refs/heads/master' + github.ref == 'refs/heads/main' shell: bash run: | echo "DENO_CANARY=true" >> $GITHUB_ENV @@ -210,7 +210,7 @@ jobs: runner.os != 'Windows' && matrix.kind == 'test_release' && github.repository == 'denoland/deno' && - github.ref == 'refs/heads/master' + github.ref == 'refs/heads/main' run: | gsutil cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/ echo $(git rev-parse HEAD) > canary-latest.txt @@ -221,7 +221,7 @@ jobs: runner.os == 'Windows' && matrix.kind == 'test_release' && github.repository == 'denoland/deno' && - github.ref == 'refs/heads/master' + github.ref == 'refs/heads/main' env: CLOUDSDK_PYTHON: ${{env.pythonLocation}}\python.exe shell: bash @@ -270,7 +270,7 @@ jobs: if: | matrix.kind == 'bench' && github.repository == 'denoland/deno' && - github.ref == 'refs/heads/master' + github.ref == 'refs/heads/main' env: DENOBOT_PAT: ${{ secrets.DENOBOT_PAT }} run: | @@ -84,9 +84,9 @@ More in-depth info can be found in the runtime We appreciate your help! To contribute, please read our -[guidelines](https://github.com/denoland/deno/blob/master/docs/contributing/style_guide.md). +[guidelines](https://github.com/denoland/deno/blob/main/docs/contributing/style_guide.md). -[Build Status - Cirrus]: https://github.com/denoland/deno/workflows/ci/badge.svg?branch=master&event=push +[Build Status - Cirrus]: https://github.com/denoland/deno/workflows/ci/badge.svg?branch=main&event=push [Build status]: https://github.com/denoland/deno/actions [Twitter badge]: https://twitter.com/intent/follow?screen_name=deno_land [Twitter handle]: https://img.shields.io/twitter/follow/deno_land.svg?style=social&label=Follow diff --git a/core/README.md b/core/README.md index 2438ecede..55ec05a2d 100644 --- a/core/README.md +++ b/core/README.md @@ -21,10 +21,10 @@ function to trigger the "dispatch" callback in Rust. The user is responsible for encoding both the request and response into a Uint8Array. Documentation for this crate is thin at the moment. Please see -[http_bench_bin_ops.rs](https://github.com/denoland/deno/blob/master/core/examples/http_bench_bin_ops.rs) +[http_bench_bin_ops.rs](https://github.com/denoland/deno/blob/main/core/examples/http_bench_bin_ops.rs) and -[http_bench_json_ops.rs](https://github.com/denoland/deno/blob/master/core/examples/http_bench_json_ops.rs) +[http_bench_json_ops.rs](https://github.com/denoland/deno/blob/main/core/examples/http_bench_json_ops.rs) as a simple example of usage. TypeScript support and a lot of other functionality is not available at this -layer. See the [CLI](https://github.com/denoland/deno/tree/master/cli) for that. +layer. See the [CLI](https://github.com/denoland/deno/tree/main/cli) for that. diff --git a/docs/contributing/building_from_source.md b/docs/contributing/building_from_source.md index 227b42418..96e3e1b88 100644 --- a/docs/contributing/building_from_source.md +++ b/docs/contributing/building_from_source.md @@ -103,7 +103,7 @@ Build with Cargo: # Build: cargo build -vv -# Build errors? Ensure you have latest master and try building again, or if that doesn't work try: +# Build errors? Ensure you have latest main and try building again, or if that doesn't work try: cargo clean && cargo build -vv # Run: diff --git a/docs/contributing/release_schedule.md b/docs/contributing/release_schedule.md index b632a81c9..7242dc164 100644 --- a/docs/contributing/release_schedule.md +++ b/docs/contributing/release_schedule.md @@ -14,7 +14,7 @@ Stable releases can be found on the ### Canary channel In addition to the stable channel described above, canaries are released -multiple times daily (for each commit on master). You can upgrade to the latest +multiple times daily (for each commit on main). You can upgrade to the latest canary release by running: ``` diff --git a/docs/runtime.md b/docs/runtime.md index 6c64c4abf..8d9a8c5c6 100644 --- a/docs/runtime.md +++ b/docs/runtime.md @@ -23,4 +23,4 @@ The TypeScript definitions for the Deno namespaces can be found in the file. The documentation for all of the Deno specific APIs can be found on -[doc.deno.land](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/dts/lib.deno.ns.d.ts). +[doc.deno.land](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/main/cli/dts/lib.deno.ns.d.ts). diff --git a/docs/runtime/stability.md b/docs/runtime/stability.md index 6bb60ae5c..9cdc1eea8 100644 --- a/docs/runtime/stability.md +++ b/docs/runtime/stability.md @@ -15,7 +15,7 @@ Passing this flag does a few things: - It enables the use of unstable APIs during runtime. - It adds the - [`lib.deno.unstable.d.ts`](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/master/cli/dts/lib.deno.unstable.d.ts) + [`lib.deno.unstable.d.ts`](https://doc.deno.land/https/raw.githubusercontent.com/denoland/deno/main/cli/dts/lib.deno.unstable.d.ts) file to the list of TypeScript definitions that are used for type checking. This includes the output of `deno types`. diff --git a/docs/standard_library.md b/docs/standard_library.md index b2110b6eb..36006d3ee 100644 --- a/docs/standard_library.md +++ b/docs/standard_library.md @@ -14,11 +14,11 @@ Deno is released. We strongly suggest to always use imports with pinned version of standard library to avoid unintended changes. For example, rather than linking to the -master branch of code, which may change at any time, potentially causing +default branch of code, which may change at any time, potentially causing compilation errors or unexpected behavior: ```typescript -// imports from master, this should be avoided +// import the latest release, this should be avoided import { copy } from "https://deno.land/std/fs/copy.ts"; ``` diff --git a/tools/wpt.ts b/tools/wpt.ts index 0167bda06..12e9047a4 100755 --- a/tools/wpt.ts +++ b/tools/wpt.ts @@ -67,7 +67,7 @@ switch (command) { update Update the \`expectation.json\` to match the current reality. -More details at https://deno.land/manual@master/contributing/web_platform_tests +More details at https://deno.land/manual@main/contributing/web_platform_tests `); break; |