From 0d0bda73edd6c5661927a8ae3bfeb59d73b2f039 Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:16:20 +0200 Subject: [PATCH 1/8] rm env color --- .github/workflows/bench.yml | 2 -- .github/workflows/rust.yml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index d6246888e..ff9bd1fb4 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -7,8 +7,6 @@ jobs: runs-on: ubuntu-latest env: RUSTC_VERSION: 1.82.0 - CARGO_TERM_COLOR: always # Force Cargo to use colors - TERM: xterm-256color steps: - uses: actions/checkout@v4 - name: Checkout base branch diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3c7f8a157..e1ae67b2f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -5,10 +5,6 @@ on: - master pull_request: -env: - CARGO_TERM_COLOR: always # Force Cargo to use colors - TERM: xterm-256color - jobs: rust: runs-on: ubuntu-latest From 264c4fde833db970c2b2095ce9ded8dc2e7b1140 Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:18:27 +0200 Subject: [PATCH 2/8] no xterm --- .github/workflows/bench.yml | 1 + .github/workflows/rust.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index ff9bd1fb4..d6e51d3b2 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -7,6 +7,7 @@ jobs: runs-on: ubuntu-latest env: RUSTC_VERSION: 1.82.0 + CARGO_TERM_COLOR: always # Force Cargo to use colors steps: - uses: actions/checkout@v4 - name: Checkout base branch diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e1ae67b2f..d87a914a6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -5,6 +5,9 @@ on: - master pull_request: +env: + CARGO_TERM_COLOR: always # Force Cargo to use colors + jobs: rust: runs-on: ubuntu-latest From dc995fa6a88b165632c1d5bf62a52db6445cb9cb Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:20:05 +0200 Subject: [PATCH 3/8] no env, only color always --- .github/workflows/bench.yml | 3 +-- .github/workflows/rust.yml | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index d6e51d3b2..acdd7ea31 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -7,7 +7,6 @@ jobs: runs-on: ubuntu-latest env: RUSTC_VERSION: 1.82.0 - CARGO_TERM_COLOR: always # Force Cargo to use colors steps: - uses: actions/checkout@v4 - name: Checkout base branch @@ -38,7 +37,7 @@ jobs: rust/bench/target key: ${{ runner.os }}-bench-0.1.4-${{ hashFiles('**/Cargo.lock') }} - name: Install canbench - run: cargo install --version 0.2.0 --locked canbench + run: cargo install --version 0.2.0 --locked canbench --color always - name: Run perf for base branch run: | pushd main/rust/bench diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d87a914a6..cce7bfad5 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -5,9 +5,6 @@ on: - master pull_request: -env: - CARGO_TERM_COLOR: always # Force Cargo to use colors - jobs: rust: runs-on: ubuntu-latest @@ -30,7 +27,7 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Build run: | - cargo build + cargo build --color always - name: Run tests run: | cargo test --no-default-features --color always -- --color always From b55d86612cbfe60d237750ab4b4717e74e1c528b Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:21:33 +0200 Subject: [PATCH 4/8] env + min color always --- .github/workflows/bench.yml | 3 ++- .github/workflows/rust.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index acdd7ea31..d6e51d3b2 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -7,6 +7,7 @@ jobs: runs-on: ubuntu-latest env: RUSTC_VERSION: 1.82.0 + CARGO_TERM_COLOR: always # Force Cargo to use colors steps: - uses: actions/checkout@v4 - name: Checkout base branch @@ -37,7 +38,7 @@ jobs: rust/bench/target key: ${{ runner.os }}-bench-0.1.4-${{ hashFiles('**/Cargo.lock') }} - name: Install canbench - run: cargo install --version 0.2.0 --locked canbench --color always + run: cargo install --version 0.2.0 --locked canbench - name: Run perf for base branch run: | pushd main/rust/bench diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index cce7bfad5..e9dfbb4c1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -5,6 +5,9 @@ on: - master pull_request: +env: + CARGO_TERM_COLOR: always # Force Cargo to use colors + jobs: rust: runs-on: ubuntu-latest @@ -27,12 +30,12 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Build run: | - cargo build --color always + cargo build - name: Run tests run: | - cargo test --no-default-features --color always -- --color always - cargo test --color always -- --color always - cargo test --features all --color always -- --color always + cargo test --no-default-features -- --color always + cargo test -- --color always + cargo test --features all -- --color always - name: fmt run: cargo fmt -v -- --check - name: lint From 3d258f5e728fff2e7f08ceaa6592d95b2c691230 Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:23:22 +0200 Subject: [PATCH 5/8] change color always --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e9dfbb4c1..050860366 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,9 +33,9 @@ jobs: cargo build - name: Run tests run: | - cargo test --no-default-features -- --color always - cargo test -- --color always - cargo test --features all -- --color always + cargo test --no-default-features --color always + cargo test --color always + cargo test --features all --color always - name: fmt run: cargo fmt -v -- --check - name: lint From f2ee8130754c967e83e67c8a165566565f2110ac Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:24:46 +0200 Subject: [PATCH 6/8] all color always --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 050860366..d87a914a6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,9 +33,9 @@ jobs: cargo build - name: Run tests run: | - cargo test --no-default-features --color always - cargo test --color always - cargo test --features all --color always + cargo test --no-default-features --color always -- --color always + cargo test --color always -- --color always + cargo test --features all --color always -- --color always - name: fmt run: cargo fmt -v -- --check - name: lint From aaf82dd99b1e57de76a0765cf07f7bbe212d4f79 Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:26:38 +0200 Subject: [PATCH 7/8] add xterm, no colors always --- .github/workflows/bench.yml | 1 + .github/workflows/rust.yml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index d6e51d3b2..d6246888e 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -8,6 +8,7 @@ jobs: env: RUSTC_VERSION: 1.82.0 CARGO_TERM_COLOR: always # Force Cargo to use colors + TERM: xterm-256color steps: - uses: actions/checkout@v4 - name: Checkout base branch diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d87a914a6..5f3831b45 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -7,6 +7,7 @@ on: env: CARGO_TERM_COLOR: always # Force Cargo to use colors + TERM: xterm-256color jobs: rust: @@ -33,9 +34,9 @@ jobs: cargo build - name: Run tests run: | - cargo test --no-default-features --color always -- --color always - cargo test --color always -- --color always - cargo test --features all --color always -- --color always + cargo test --no-default-features + cargo test + cargo test --features all - name: fmt run: cargo fmt -v -- --check - name: lint From 3bbd25e9676856aaa15b27dd415c444fadff65f9 Mon Sep 17 00:00:00 2001 From: Maksym Arutyunyan Date: Wed, 11 Jun 2025 20:28:13 +0200 Subject: [PATCH 8/8] no first color always --- .github/workflows/rust.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5f3831b45..ed0996638 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -34,9 +34,9 @@ jobs: cargo build - name: Run tests run: | - cargo test --no-default-features - cargo test - cargo test --features all + cargo test --no-default-features -- --color always + cargo test -- --color always + cargo test --features all -- --color always - name: fmt run: cargo fmt -v -- --check - name: lint