From 6158bb053df1a02c6409a7e7ef96ce96fdc9b317 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Thu, 5 Dec 2024 22:15:23 +0200
Subject: [PATCH 1/2] Add colour to CI output

---
 .github/workflows/build.yml                | 3 +++
 .github/workflows/jit.yml                  | 3 +++
 .github/workflows/reusable-macos.yml       | 1 +
 .github/workflows/reusable-tsan.yml        | 3 +++
 .github/workflows/reusable-wasi.yml        | 3 +++
 .github/workflows/reusable-windows-msi.yml | 3 +++
 .github/workflows/reusable-windows.yml     | 1 +
 7 files changed, 17 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6667512369716d..0c20b85acbd565 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,6 +18,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-reusable
   cancel-in-progress: true
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   check_source:
     name: Change detection
diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
index 6f214ad4bc6978..806a8524112d76 100644
--- a/.github/workflows/jit.yml
+++ b/.github/workflows/jit.yml
@@ -25,6 +25,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   interpreter:
     name: Interpreter (Debug)
diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
index cdbe05e09fb8e7..68446250ef76b1 100644
--- a/.github/workflows/reusable-macos.yml
+++ b/.github/workflows/reusable-macos.yml
@@ -20,6 +20,7 @@ jobs:
     name: build and test (${{ inputs.os }})
     timeout-minutes: 60
     env:
+      FORCE_COLOR: 1
       HOMEBREW_NO_ANALYTICS: 1
       HOMEBREW_NO_AUTO_UPDATE: 1
       HOMEBREW_NO_INSTALL_CLEANUP: 1
diff --git a/.github/workflows/reusable-tsan.yml b/.github/workflows/reusable-tsan.yml
index b5144ca3e9efc4..269f479849f21e 100644
--- a/.github/workflows/reusable-tsan.yml
+++ b/.github/workflows/reusable-tsan.yml
@@ -18,6 +18,9 @@ on:
         required: true
         type: string
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build_tsan_reusable:
     name: 'Thread sanitizer'
diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml
index 4356d9c1c8795e..4456b83c8e0032 100644
--- a/.github/workflows/reusable-wasi.yml
+++ b/.github/workflows/reusable-wasi.yml
@@ -7,6 +7,9 @@ on:
         required: true
         type: string
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build_wasi_reusable:
     name: 'build and test'
diff --git a/.github/workflows/reusable-windows-msi.yml b/.github/workflows/reusable-windows-msi.yml
index a1c45d954247fb..bc0414d1bbcd8f 100644
--- a/.github/workflows/reusable-windows-msi.yml
+++ b/.github/workflows/reusable-windows-msi.yml
@@ -11,6 +11,9 @@ on:
 permissions:
   contents: read
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build:
     name: installer for ${{ inputs.arch }}
diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
index 459d2b29e5d42b..bfee3d2722cb44 100644
--- a/.github/workflows/reusable-windows.yml
+++ b/.github/workflows/reusable-windows.yml
@@ -18,6 +18,7 @@ on:
         default: false
 
 env:
+  FORCE_COLOR: 1
   IncludeUwp: >-
     true
 

From 5b1a5537974585fde6a3426fbb854f32263a28b6 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Wed, 22 Jan 2025 22:49:13 +0200
Subject: [PATCH 2/2] Move FORCE_COLOR to top-level

---
 .github/workflows/reusable-macos.yml  | 4 +++-
 .github/workflows/reusable-ubuntu.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml
index 68446250ef76b1..4e7aced94a321c 100644
--- a/.github/workflows/reusable-macos.yml
+++ b/.github/workflows/reusable-macos.yml
@@ -15,12 +15,14 @@ on:
         required: true
         type: string
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build_macos:
     name: build and test (${{ inputs.os }})
     timeout-minutes: 60
     env:
-      FORCE_COLOR: 1
       HOMEBREW_NO_ANALYTICS: 1
       HOMEBREW_NO_AUTO_UPDATE: 1
       HOMEBREW_NO_INSTALL_CLEANUP: 1
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index 686e8fe1abc980..aa8ba00f19d8ca 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -21,13 +21,15 @@ on:
          required: true
          type: string
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build_ubuntu_reusable:
     name: build and test (${{ inputs.os }})
     timeout-minutes: 60
     runs-on: ${{ inputs.os }}
     env:
-      FORCE_COLOR: 1
       OPENSSL_VER: 3.0.15
       PYTHONSTRICTEXTENSIONBUILD: 1
       TERM: linux