Skip to content

Commit

Permalink
Rename the master branch to main (#1924)
Browse files Browse the repository at this point in the history
* This PR is against a branch called `main`
* Internally all docs/CI/etc is updated
* The default branch of the repo is now `main`
* All active PRs have been updated to retarget `main`

Closes #1914
  • Loading branch information
alexcrichton authored Jun 25, 2020
1 parent c91a931 commit a92a31d
Show file tree
Hide file tree
Showing 33 changed files with 45 additions and 45 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: CI
on:
push:
branches: [master]
branches: [main]
tags-ignore: [dev]
pull_request:
branches: [master]
branches: [main]
defaults:
run:
shell: bash
Expand Down Expand Up @@ -461,7 +461,7 @@ jobs:
mv doc-book gh-pages
mv doc-api gh-pages/api
# If this is a push to the master branch push to the `gh-pages` using a
# If this is a push to the main branch push to the `gh-pages` using a
# deploy key. Note that a deploy key is necessary for now because otherwise
# using the default token for github actions doesn't actually trigger a page
# rebuild.
Expand All @@ -471,7 +471,7 @@ jobs:
GITHUB_DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
BUILD_REPOSITORY_ID: ${{ github.repository }}
BUILD_SOURCEVERSION: ${{ github.sha }}
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
if: github.event_name == 'push' && github.ref == 'refs/heads/main'

- name: Calculate tag name
run: |
Expand Down Expand Up @@ -509,12 +509,12 @@ jobs:
mkdir -p tmp/whl
find dist/ -name '*.whl' -type f -exec cp '{}' tmp/whl -v \;
# ... and if this was an actual push (tag or `master`) then we publish a
# ... and if this was an actual push (tag or `main`) then we publish a
# new release. This'll automatically publish a tag release or update `dev`
# with this `sha`
- name: Publish Release
uses: ./.github/actions/github-release
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
with:
files: "dist/*"
name: ${{ steps.tagname.outputs.val }}
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[OCoC]: https://github.com/bytecodealliance/wasmtime/blob/master/ORG_CODE_OF_CONDUCT.md
[OCoC]: https://github.com/bytecodealliance/wasmtime/blob/main/ORG_CODE_OF_CONDUCT.md
[homepage]: https://www.contributor-covenant.org
[version]: https://www.contributor-covenant.org/version/1/4/
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Hello, world!
well. Wasmtime developers are intimately engaged with the WebAssembly
standards process all along the way too.

[Cranelift]: https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/README.md
[Cranelift]: https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/README.md
[embedded]: https://bytecodealliance.github.io/wasmtime/lang.html

## Language Support
Expand All @@ -101,8 +101,8 @@ the implementation:
[C]: https://bytecodealliance.github.io/wasmtime/examples-c-embed.html
[`wasmtime` crate]: https://crates.io/crates/wasmtime
[`wasm.h`]: https://github.com/WebAssembly/wasm-c-api/blob/master/include/wasm.h
[`wasi.h`]: https://github.com/bytecodealliance/wasmtime/blob/master/crates/c-api/include/wasi.h
[`wasmtime.h`]: https://github.com/bytecodealliance/wasmtime/blob/master/crates/c-api/include/wasmtime.h
[`wasi.h`]: https://github.com/bytecodealliance/wasmtime/blob/main/crates/c-api/include/wasi.h
[`wasmtime.h`]: https://github.com/bytecodealliance/wasmtime/blob/main/crates/c-api/include/wasmtime.h
[Python]: https://bytecodealliance.github.io/wasmtime/lang-python.html
[`wasmtime` PyPI package]: https://pypi.org/project/wasmtime/
[.NET]: https://bytecodealliance.github.io/wasmtime/lang-dotnet.html
Expand Down
2 changes: 1 addition & 1 deletion cranelift/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["The Cranelift Project Developers"]
version = "0.65.0"
description = "Binaries for testing the Cranelift libraries"
license = "Apache-2.0 WITH LLVM-exception"
documentation = "https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/index.md"
documentation = "https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/docs/index.md"
repository = "https://github.com/bytecodealliance/wasmtime"
publish = false
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion cranelift/codegen/src/result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub enum CodegenError {
/// Cranelift can compile very large and complicated functions, but the [implementation has
/// limits][limits] that cause compilation to fail when they are exceeded.
///
/// [limits]: https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/ir.md#implementation-limits
/// [limits]: https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/docs/ir.md#implementation-limits
#[error("Implementation limit exceeded")]
ImplLimitExceeded,

Expand Down
4 changes: 2 additions & 2 deletions cranelift/peepmatic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<p>
<b>
<code>peepmatic</code> is a DSL and compiler for peephole optimizers for
<a href="https://github.com/bytecodealliance/wasmtime/tree/master/cranelift#readme">Cranelift</a>.
<a href="https://github.com/bytecodealliance/wasmtime/tree/main/cranelift#readme">Cranelift</a>.
</b>
</p>

Expand Down Expand Up @@ -59,7 +59,7 @@ Cranelift's clif intermediate representation. The intended next target is
Cranelift's new backend's "vcode" intermediate representation. Supporting
non-Cranelift targets is not a goal.

[Cranelift]: https://github.com/bytecodealliance/wasmtime/tree/master/cranelift#readme
[Cranelift]: https://github.com/bytecodealliance/wasmtime/tree/main/cranelift#readme
[Souper]: https://github.com/google/souper
[Alive]: https://github.com/AliveToolkit/alive2

Expand Down
2 changes: 1 addition & 1 deletion cranelift/simplejit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ This crate is extremely experimental.

See the [example program] for a brief overview of how to use this.

[example program]: https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/simplejit/examples/simplejit-minimal.rs
[example program]: https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/simplejit/examples/simplejit-minimal.rs
2 changes: 1 addition & 1 deletion cranelift/wasm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ If you're looking for a complete WebAssembly implementation that uses this
library, see [Wasmtime].

[Wasmtime]: https://github.com/bytecodealliance/wasmtime
[Cranelift IR]: https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/ir.md
[Cranelift IR]: https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/docs/ir.md
2 changes: 1 addition & 1 deletion cranelift/wasm/src/environ/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pub enum WasmError {
/// Cranelift can compile very large and complicated functions, but the [implementation has
/// limits][limits] that cause compilation to fail when they are exceeded.
///
/// [limits]: https://github.com/bytecodealliance/wasmtime/blob/master/cranelift/docs/ir.md#implementation-limits
/// [limits]: https://github.com/bytecodealliance/wasmtime/blob/main/cranelift/docs/ir.md#implementation-limits
#[error("Implementation limit exceeded")]
ImplLimitExceeded,

Expand Down
2 changes: 1 addition & 1 deletion crates/wasi-common/yanix/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//! which is our WASI implementation, [wasi-common].
//!
//! [nix]: https://github.com/nix-rust/nix
//! [wasi-common]: https://github.com/bytecodealliance/wasmtime/tree/master/crates/wasi-common
//! [wasi-common]: https://github.com/bytecodealliance/wasmtime/tree/main/crates/wasi-common
#![cfg(unix)]

pub mod clock;
Expand Down
2 changes: 1 addition & 1 deletion docs/WASI-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ or `cargo run --bin wasmtime foo.wasm`.

The polyfill is online [here](https://wasi.dev/polyfill/).

The source is [here](https://github.com/bytecodealliance/wasmtime/tree/master/crates/wasi-c/js-polyfill).
The source is [here](https://github.com/bytecodealliance/wasmtime/tree/main/crates/wasi-c/js-polyfill).

## Where can I learn more?

Expand Down
2 changes: 1 addition & 1 deletion docs/cli-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ precompiled binaries:
1. Each tagged release will have a full set of release artifacts on the [GitHub
releases page][releases].
2. The [`dev` release] is also continuously updated with the latest build of the
`master` branch. If you want the latest-and-greatest and don't mind a bit of
`main` branch. If you want the latest-and-greatest and don't mind a bit of
instability, this is the release for you.

[`dev` release]: https://github.com/bytecodealliance/wasmtime/releases/tag/dev
Expand Down
8 changes: 4 additions & 4 deletions docs/contributing-ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ what's expected of contributors.
All CI currently happens on GitHub Actions and is configured in the [`.github`
directory][dir] of the repository.

[dir]: https://github.com/bytecodealliance/wasmtime/tree/master/.github
[dir]: https://github.com/bytecodealliance/wasmtime/tree/main/.github

## PRs and CI

Expand All @@ -33,7 +33,7 @@ run on CI looks like this:

* Book documentation tests - code snippets (Rust ones at least) in the book
documentation ([the `docs`
folder](https://github.com/bytecodealliance/wasmtime/tree/master/docs)) are
folder](https://github.com/bytecodealliance/wasmtime/tree/main/docs)) are
tested on CI to ensure they are working.

* Crate tests - the moral equivalent of `cargo test --all` and `cargo test --all
Expand Down Expand Up @@ -78,7 +78,7 @@ builder](https://github.com/bytecodealliance/wasmtime/runs/488719677?check_suite
you can see the artifacts link in the top right. Note that artifacts don't
become available until the whole run finishes.

Commits merged into the master branch will rerun CI and will also produce
artifacts as usual. On the master branch, however, documentation is pushed to
Commits merged into the `main` branch will rerun CI and will also produce
artifacts as usual. On the `main` branch, however, documentation is pushed to
the `gh-pages` branch as well, and binaries are pushed to the `dev` release on
GitHub. Finally, tagged commits get a whole dedicated release to them too.
2 changes: 1 addition & 1 deletion docs/contributing-fuzzing.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ fuzz`](https://rust-fuzz.github.io/book/cargo-fuzz.html). They are defined in
the `fuzz` subdirectory.

See
[`fuzz/README.md`](https://github.com/bytecodealliance/wasmtime/blob/master/fuzz/README.md)
[`fuzz/README.md`](https://github.com/bytecodealliance/wasmtime/blob/main/fuzz/README.md)
for details on how to run these fuzz targets and set up a corpus of seed inputs.
2 changes: 1 addition & 1 deletion docs/examples-c-debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/fib-debug/main.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/fib-debug/main.c

This example shows off how to set up a module for dynamic runtime debugging via
a native debugger like GDB or LLDB.
Expand Down
4 changes: 2 additions & 2 deletions docs/examples-c-embed.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ themselves one day.

[proposal]: https://github.com/webassembly/wasm-c-api
[`wasm.h`]: https://github.com/WebAssembly/wasm-c-api/blob/master/include/wasm.h
[`wasi.h`]: https://github.com/bytecodealliance/wasmtime/blob/master/crates/c-api/include/wasi.h
[`wasmtime.h`]: https://github.com/bytecodealliance/wasmtime/blob/master/crates/c-api/include/wasmtime.h
[`wasi.h`]: https://github.com/bytecodealliance/wasmtime/blob/main/crates/c-api/include/wasi.h
[`wasmtime.h`]: https://github.com/bytecodealliance/wasmtime/blob/main/crates/c-api/include/wasmtime.h
2 changes: 1 addition & 1 deletion docs/examples-c-gcd.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/gcd.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/gcd.c

This example shows off how run a wasm program which calculates the GCD of two
numbers.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-c-hello-world.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/hello.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/hello.c

This example shows off how to instantiate a simple wasm module and interact with
it.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-c-linking.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/linking.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/linking.c

This example shows off how to compile and instantiate modules which link
together.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-c-memory.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/memory.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/memory.c

This example shows off how to interact with wasm memory in a module. Be sure to
read the documentation for [`Memory`] as well.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-c-multi-value.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/multi.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/multi.c

This example shows off how to interact with a wasm module that uses multi-value
exports and imports.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-c-wasi.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/wasi/main.c
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/wasi/main.c

This example shows off how to instantiate a wasm module using WASI imports.

Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/fib-debug/main.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/fib-debug/main.rs

This example shows off how to set up a module for dynamic runtime debugging via
a native debugger like GDB or LLDB.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-gcd.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/gcd.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/gcd.rs

This example shows off how run a wasm program which calculates the GCD of two
numbers.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-hello-world.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/hello.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/hello.rs

This example shows off how to instantiate a simple wasm module and interact with
it.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-linking.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/linking.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/linking.rs

This example shows off how to compile and instantiate modules which link
together.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-memory.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/memory.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/memory.rs

This example shows off how to interact with wasm memory in a module. Be sure to
read the documentation for [`Memory`] as well.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-multi-value.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/multi.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/multi.rs

This example shows off how to interact with a wasm module that uses multi-value
exports and imports.
Expand Down
2 changes: 1 addition & 1 deletion docs/examples-rust-wasi.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/examples/wasi/main.rs
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/examples/wasi/main.rs

This example shows off how to instantiate a wasm module using WASI imports.

Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This guide is intended to server a number of purposes and within you'll find:
Wasmtime.

... and more! The source for this guide [lives on
GitHub](https://github.com/bytecodealliance/wasmtime/tree/master/docs) and
GitHub](https://github.com/bytecodealliance/wasmtime/tree/main/docs) and
contributions are welcome!

[github]: https://github.com/bytecodealliance/wasmtime
Expand Down
2 changes: 1 addition & 1 deletion docs/lang-dotnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ WebAssembly code in .NET!
The [.NET embedding of Wasmtime repository](https://github.com/bytecodealliance/wasmtime-dotnet)
contains the source code for the Wasmtime NuGet package.

The repository also has more [examples](https://github.com/bytecodealliance/wasmtime-dotnet/tree/master/examples)
The repository also has more [examples](https://github.com/bytecodealliance/wasmtime-dotnet/tree/main/examples)
as well.

Feel free to browse those, but if you find anything missing don't
Expand Down
2 changes: 1 addition & 1 deletion docs/lang-python.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ print("gcd(27, 6) =", gcd(27, 6))
The `wasmtime` Python package currently [lives in its own repository outside of
`wasmtime`](https://github.com/bytecodealliance/wasmtime-py) and has a [number
of other more advanced
examples](https://github.com/bytecodealliance/wasmtime-py/tree/master/examples)
examples](https://github.com/bytecodealliance/wasmtime-py/tree/main/examples)
as well. Feel free to browse those, but if you find anything missing don't
hesitate to [open an
issue](https://github.com/bytecodealliance/wasmtime-py/issues/new) and let us
Expand Down
2 changes: 1 addition & 1 deletion docs/wasm-assemblyscript.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ It can also be packaged using a `package.json` file:
You can also [browse this source code online][code] and clone the wasmtime
repository to run the example locally.

[code]: https://github.com/bytecodealliance/wasmtime/blob/master/docs/assemblyscript-hello-world
[code]: https://github.com/bytecodealliance/wasmtime/blob/main/docs/assemblyscript-hello-world
[AssemblyScript]: https://assemblyscript.org
[as-wasi]: https://github.com/jedisct1/as-wasi
[half runtime]: https://docs.assemblyscript.org/details/runtime#runtime-variants
Expand Down

0 comments on commit a92a31d

Please sign in to comment.