Browse Source

Fix master refs to main (#1637)

pull/1638/head
Jason Williams 3 years ago committed by GitHub
parent
commit
21a5b3418e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .github/workflows/master.yml
  2. 2
      .github/workflows/release.yml
  3. 4
      .github/workflows/rust.yml
  4. 6
      .github/workflows/test262.yml
  5. 4
      .github/workflows/webassembly.yml
  6. 2
      README.md
  7. 4
      boa/src/lib.rs
  8. 4
      boa_tester/src/main.rs
  9. 10
      boa_tester/src/results.rs

4
.github/workflows/master.yml

@ -1,8 +1,8 @@
name: Master workflows
name: Main workflows
on:
push:
branches:
- master
- main
jobs:
benchmark:

2
.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

4
.github/workflows/rust.yml

@ -1,10 +1,10 @@
on:
pull_request:
branches:
- master
- main
push:
branches:
- master
- main
name: Continuous integration

6
.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'}"

4
.github/workflows/webassembly.yml

@ -1,10 +1,10 @@
on:
pull_request:
branches:
- master
- main
push:
branches:
- master
- main
name: Webassembly demo

2
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)

4
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,

4
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,

10
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,

Loading…
Cancel
Save