Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix master refs to main #1637

Merged
merged 1 commit into from
Oct 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Master workflows
name: Main workflows
on:
push:
branches:
- master
- main

jobs:
benchmark:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
on:
pull_request:
branches:
- master
- main
push:
branches:
- master
- main

name: Continuous integration

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test262.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/webassembly.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
on:
pull_request:
branches:
- master
- main
push:
branches:
- master
- main

name: Webassembly demo

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions boa/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions boa_tester/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions boa_tester/src/results.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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");
}
}

Expand Down Expand Up @@ -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 | {} | {} | {} |",
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down