diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc75f9f17a..074de2b47a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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. @@ -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: | @@ -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 }} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b671a33264..14db69404f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -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/ diff --git a/README.md b/README.md index 5c9309062c..415fb15aa3 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml index 5057408344..7c63bea275 100644 --- a/cranelift/Cargo.toml +++ b/cranelift/Cargo.toml @@ -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" diff --git a/cranelift/codegen/src/result.rs b/cranelift/codegen/src/result.rs index 5ea91f8a05..493545c151 100644 --- a/cranelift/codegen/src/result.rs +++ b/cranelift/codegen/src/result.rs @@ -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, diff --git a/cranelift/peepmatic/README.md b/cranelift/peepmatic/README.md index 0d146ef520..462a4a4084 100644 --- a/cranelift/peepmatic/README.md +++ b/cranelift/peepmatic/README.md @@ -4,7 +4,7 @@

peepmatic is a DSL and compiler for peephole optimizers for - Cranelift. + Cranelift.

@@ -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 diff --git a/cranelift/simplejit/README.md b/cranelift/simplejit/README.md index 4f0fe3d4e0..c3b0693b17 100644 --- a/cranelift/simplejit/README.md +++ b/cranelift/simplejit/README.md @@ -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 diff --git a/cranelift/wasm/README.md b/cranelift/wasm/README.md index b8bee2e098..556b4b9ede 100644 --- a/cranelift/wasm/README.md +++ b/cranelift/wasm/README.md @@ -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 diff --git a/cranelift/wasm/src/environ/spec.rs b/cranelift/wasm/src/environ/spec.rs index 3f7d439be6..32f7420644 100644 --- a/cranelift/wasm/src/environ/spec.rs +++ b/cranelift/wasm/src/environ/spec.rs @@ -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, diff --git a/crates/wasi-common/yanix/src/lib.rs b/crates/wasi-common/yanix/src/lib.rs index f4caea998d..955a809436 100644 --- a/crates/wasi-common/yanix/src/lib.rs +++ b/crates/wasi-common/yanix/src/lib.rs @@ -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; diff --git a/docs/WASI-intro.md b/docs/WASI-intro.md index 28a2a9f670..187f3003c4 100644 --- a/docs/WASI-intro.md +++ b/docs/WASI-intro.md @@ -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? diff --git a/docs/cli-install.md b/docs/cli-install.md index 801d2f5a31..510170e339 100644 --- a/docs/cli-install.md +++ b/docs/cli-install.md @@ -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 diff --git a/docs/contributing-ci.md b/docs/contributing-ci.md index 4dc9917f88..c7b422ca0e 100644 --- a/docs/contributing-ci.md +++ b/docs/contributing-ci.md @@ -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 @@ -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 @@ -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. diff --git a/docs/contributing-fuzzing.md b/docs/contributing-fuzzing.md index 1a0757e129..0432b76656 100644 --- a/docs/contributing-fuzzing.md +++ b/docs/contributing-fuzzing.md @@ -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. diff --git a/docs/examples-c-debugging.md b/docs/examples-c-debugging.md index 5fc2068ac9..9e0c04abcb 100644 --- a/docs/examples-c-debugging.md +++ b/docs/examples-c-debugging.md @@ -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. diff --git a/docs/examples-c-embed.md b/docs/examples-c-embed.md index 13c7999c0b..d5c5918b31 100644 --- a/docs/examples-c-embed.md +++ b/docs/examples-c-embed.md @@ -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 diff --git a/docs/examples-c-gcd.md b/docs/examples-c-gcd.md index bb668f9709..3816c94d3a 100644 --- a/docs/examples-c-gcd.md +++ b/docs/examples-c-gcd.md @@ -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. diff --git a/docs/examples-c-hello-world.md b/docs/examples-c-hello-world.md index 3416259e72..e27dfa370c 100644 --- a/docs/examples-c-hello-world.md +++ b/docs/examples-c-hello-world.md @@ -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. diff --git a/docs/examples-c-linking.md b/docs/examples-c-linking.md index dd3cb9b399..51e327f9fa 100644 --- a/docs/examples-c-linking.md +++ b/docs/examples-c-linking.md @@ -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. diff --git a/docs/examples-c-memory.md b/docs/examples-c-memory.md index 19157d4307..758f61d7b2 100644 --- a/docs/examples-c-memory.md +++ b/docs/examples-c-memory.md @@ -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. diff --git a/docs/examples-c-multi-value.md b/docs/examples-c-multi-value.md index cd9640b0e0..c55ef0db76 100644 --- a/docs/examples-c-multi-value.md +++ b/docs/examples-c-multi-value.md @@ -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. diff --git a/docs/examples-c-wasi.md b/docs/examples-c-wasi.md index b51dfed6e1..70dda92c5e 100644 --- a/docs/examples-c-wasi.md +++ b/docs/examples-c-wasi.md @@ -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. diff --git a/docs/examples-rust-debugging.md b/docs/examples-rust-debugging.md index acd86e1a8d..3ef9564139 100644 --- a/docs/examples-rust-debugging.md +++ b/docs/examples-rust-debugging.md @@ -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. diff --git a/docs/examples-rust-gcd.md b/docs/examples-rust-gcd.md index 061b5ebe66..bbc9c608ad 100644 --- a/docs/examples-rust-gcd.md +++ b/docs/examples-rust-gcd.md @@ -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. diff --git a/docs/examples-rust-hello-world.md b/docs/examples-rust-hello-world.md index b61084c49b..ce8edd24af 100644 --- a/docs/examples-rust-hello-world.md +++ b/docs/examples-rust-hello-world.md @@ -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. diff --git a/docs/examples-rust-linking.md b/docs/examples-rust-linking.md index bb2f9467a7..14c041ce75 100644 --- a/docs/examples-rust-linking.md +++ b/docs/examples-rust-linking.md @@ -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. diff --git a/docs/examples-rust-memory.md b/docs/examples-rust-memory.md index de52a8be39..30c5ae7bc8 100644 --- a/docs/examples-rust-memory.md +++ b/docs/examples-rust-memory.md @@ -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. diff --git a/docs/examples-rust-multi-value.md b/docs/examples-rust-multi-value.md index b119502446..af42117c5f 100644 --- a/docs/examples-rust-multi-value.md +++ b/docs/examples-rust-multi-value.md @@ -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. diff --git a/docs/examples-rust-wasi.md b/docs/examples-rust-wasi.md index 59a7aa8616..acedf9b7b3 100644 --- a/docs/examples-rust-wasi.md +++ b/docs/examples-rust-wasi.md @@ -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. diff --git a/docs/introduction.md b/docs/introduction.md index 5ea7d32ea3..dc8799dca7 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -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 diff --git a/docs/lang-dotnet.md b/docs/lang-dotnet.md index 6078263567..60a154b042 100644 --- a/docs/lang-dotnet.md +++ b/docs/lang-dotnet.md @@ -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 diff --git a/docs/lang-python.md b/docs/lang-python.md index 83a8a17681..6ea145c88b 100644 --- a/docs/lang-python.md +++ b/docs/lang-python.md @@ -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 diff --git a/docs/wasm-assemblyscript.md b/docs/wasm-assemblyscript.md index fddd9bd741..b512fc6ea7 100644 --- a/docs/wasm-assemblyscript.md +++ b/docs/wasm-assemblyscript.md @@ -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