diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3f9f0966f7e..0578b1cf9eb 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1,8 +1,8 @@ -name: Master workflows +name: Main workflows on: push: branches: - - master + - main jobs: benchmark: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1433880cdd2..353b644b5a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2.3.4 with: - ref: master + ref: main - uses: actions/checkout@v2.3.4 with: ref: gh-pages diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 142c2206bb5..e14f7ea509e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,10 +1,10 @@ on: pull_request: branches: - - master + - main push: branches: - - master + - main name: Continuous integration diff --git a/.github/workflows/test262.yml b/.github/workflows/test262.yml index e64d47a2dbb..27e83e56dd5 100644 --- a/.github/workflows/test262.yml +++ b/.github/workflows/test262.yml @@ -2,12 +2,12 @@ name: EcmaScript official test suite (test262) on: push: branches: - - master + - main tags: - v* pull_request: branches: - - master + - main jobs: run_test262: @@ -55,7 +55,7 @@ jobs: shell: bash run: | cd boa - comment="$(./target/release/boa_tester compare ../gh-pages/test262/refs/heads/master/latest.json ../results/test262/pull/latest.json -m)" + comment="$(./target/release/boa_tester compare ../gh-pages/test262/refs/heads/main/latest.json ../results/test262/pull/latest.json -m)" comment="${comment//'%'/'%25'}" comment="${comment//$'\n'/'%0A'}" comment="${comment//$'\r'/'%0D'}" diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml index 4b7e90ba2ff..485d4ca1d4a 100644 --- a/.github/workflows/webassembly.yml +++ b/.github/workflows/webassembly.yml @@ -1,10 +1,10 @@ on: pull_request: branches: - - master + - main push: branches: - - master + - main name: Webassembly demo diff --git a/README.md b/README.md index 0f6f50a7e3e..4f63a6d8a7b 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This is an experimental Javascript lexer, parser and interpreter written in Rust Currently, it has support for some of the language. [![Build Status][build_badge]][build_link] -[![codecov](https://codecov.io/gh/boa-dev/boa/branch/master/graph/badge.svg)](https://codecov.io/gh/boa-dev/boa) +[![codecov](https://codecov.io/gh/boa-dev/boa/branch/main/graph/badge.svg)](https://codecov.io/gh/boa-dev/boa) [![](http://meritbadge.herokuapp.com/boa)](https://crates.io/crates/boa) [![](https://docs.rs/Boa/badge.svg)](https://docs.rs/Boa/) ![Discord](https://img.shields.io/discord/595323158140158003?logo=discord) diff --git a/boa/src/lib.rs b/boa/src/lib.rs index 1f1100dc791..841c70c7f2f 100644 --- a/boa/src/lib.rs +++ b/boa/src/lib.rs @@ -9,8 +9,8 @@ This is an experimental Javascript lexer, parser and compiler written in Rust. C **/ #![doc( - html_logo_url = "https://raw.githubusercontent.com/jasonwilliams/boa/master/assets/logo.svg", - html_favicon_url = "https://raw.githubusercontent.com/jasonwilliams/boa/master/assets/logo.svg" + html_logo_url = "https://raw.githubusercontent.com/boa-dev/boa/main/assets/logo.svg", + html_favicon_url = "https://raw.githubusercontent.com/boa-dev/boa/main/assets/logo.svg" )] #![deny( clippy::all, diff --git a/boa_tester/src/main.rs b/boa_tester/src/main.rs index c5d5708d4f7..a19c0db091f 100644 --- a/boa_tester/src/main.rs +++ b/boa_tester/src/main.rs @@ -3,8 +3,8 @@ //! This crate will run the full ECMAScript test suite (Test262) and report compliance of the //! `boa` context. #![doc( - html_logo_url = "https://raw.githubusercontent.com/jasonwilliams/boa/master/assets/logo.svg", - html_favicon_url = "https://raw.githubusercontent.com/jasonwilliams/boa/master/assets/logo.svg" + html_logo_url = "https://raw.githubusercontent.com/boa-dev/boa/main/assets/logo.svg", + html_favicon_url = "https://raw.githubusercontent.com/boa-dev/boa/main/assets/logo.svg" )] #![deny( unused_qualifications, diff --git a/boa_tester/src/results.rs b/boa_tester/src/results.rs index 86c6055cdcb..cff3b14d1bc 100644 --- a/boa_tester/src/results.rs +++ b/boa_tester/src/results.rs @@ -151,7 +151,7 @@ fn update_gh_pages_repo(path: &Path, verbose: u8) { .expect("could not update GitHub Pages"); // Copy the full results file - let from = Path::new("../gh-pages/test262/refs/heads/master/").join(RESULTS_FILE_NAME); + let from = Path::new("../gh-pages/test262/refs/heads/main/").join(RESULTS_FILE_NAME); let to = path.join(RESULTS_FILE_NAME); if verbose != 0 { @@ -162,7 +162,7 @@ fn update_gh_pages_repo(path: &Path, verbose: u8) { ); } - fs::copy(from, to).expect("could not copy the master results file"); + fs::copy(from, to).expect("could not copy the main results file"); } } @@ -219,7 +219,7 @@ pub(crate) fn compare_results(base: &Path, new: &Path, markdown: bool) { } println!("### Test262 conformance changes:"); - println!("| Test result | master count | PR count | difference |"); + println!("| Test result | main count | PR count | difference |"); println!("| :---------: | :----------: | :------: | :--------: |"); println!( "| Total | {} | {} | {} |", @@ -329,7 +329,7 @@ pub(crate) fn compare_results(base: &Path, new: &Path, markdown: bool) { } } else { println!("Test262 conformance changes:"); - println!("| Test result | master | PR | difference |"); + println!("| Test result | main | PR | difference |"); println!( "| Passed | {:^6} | {:^5} | {:^10} |", base_passed, @@ -426,7 +426,7 @@ fn compute_result_diff( { let test_name = format!( "test/{}/{}.js {}(previously {:?})", - base.strip_prefix("../gh-pages/test262/refs/heads/master/latest.json") + base.strip_prefix("../gh-pages/test262/refs/heads/main/latest.json") .expect("error removing prefix") .display(), new_test.name,