From 658ae5740030e3d35165e32b102c370ca1a04eda Mon Sep 17 00:00:00 2001
From: Russell Martin <rmartin16@gmail.com>
Date: Sat, 6 May 2023 12:27:36 -0400
Subject: [PATCH 1/2] Revert "Enable colored output in GitHub CI workflows"

This reverts commit 36cbe2fd1927c4cb2304f08b0622572077a6a2e4.
---
 .github/workflows/pre-commit-update.yml     | 2 +-
 .github/workflows/python-package-create.yml | 4 ++--
 .github/workflows/towncrier-run.yml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/pre-commit-update.yml b/.github/workflows/pre-commit-update.yml
index 72ccbbc5..bc9b477c 100644
--- a/.github/workflows/pre-commit-update.yml
+++ b/.github/workflows/pre-commit-update.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Run pre-commit
         # pre-commit returns non-zero when files are changed and fails the job
         continue-on-error: true
-        run: pre-commit run --all-files --color=always
+        run: pre-commit run --all-files
 
       - name: PR Needed?
         id: pr
diff --git a/.github/workflows/python-package-create.yml b/.github/workflows/python-package-create.yml
index fcff65a2..f669aeef 100644
--- a/.github/workflows/python-package-create.yml
+++ b/.github/workflows/python-package-create.yml
@@ -71,11 +71,11 @@ jobs:
 
       - name: Build wheels
         if: inputs.build-subdirectory == ''
-        run: tox --colored yes -e package
+        run: tox -e package
 
       - name: Build wheels from subdirectory
         if: inputs.build-subdirectory != ''
-        run: tox --colored yes -e package -- ${{ inputs.build-subdirectory }}
+        run: tox -e package -- ${{ inputs.build-subdirectory }}
 
       - name: Upload Package
         uses: actions/upload-artifact@v3.1.2
diff --git a/.github/workflows/towncrier-run.yml b/.github/workflows/towncrier-run.yml
index 735858cc..e900b179 100644
--- a/.github/workflows/towncrier-run.yml
+++ b/.github/workflows/towncrier-run.yml
@@ -64,4 +64,4 @@ jobs:
       run: python -m pip install ${{ inputs.tox-source }}
 
     - name: Run towncrier check
-      run: tox --colored yes -e towncrier-check
+      run: tox -e towncrier-check

From eeeda1cf2b9de7ae03507119371f8e207046dac2 Mon Sep 17 00:00:00 2001
From: Russell Martin <rmartin16@gmail.com>
Date: Sat, 6 May 2023 12:34:31 -0400
Subject: [PATCH 2/2] Use `FORCE_COLORS` to enable colored output in CI

---
 .github/workflows/app-build-verify.yml      | 3 +++
 .github/workflows/ci.yml                    | 9 ++++++---
 .github/workflows/pre-commit-update.yml     | 1 +
 .github/workflows/python-package-create.yml | 3 +++
 .github/workflows/towncrier-run.yml         | 3 +++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml
index ae0a85a8..2274e170 100644
--- a/.github/workflows/app-build-verify.yml
+++ b/.github/workflows/app-build-verify.yml
@@ -45,6 +45,9 @@ defaults:
   run:
     shell: bash
 
+env:
+  FORCE_COLOR: "1"
+
 jobs:
   verify-app:
     name: Verify App Build
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 20c07d51..ec78ce0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,13 +6,16 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     shell: bash
 
-concurrency:
-  group: ${{ github.ref }}
-  cancel-in-progress: true
+env:
+  FORCE_COLOR: "1"
 
 jobs:
   pre-commit:
diff --git a/.github/workflows/pre-commit-update.yml b/.github/workflows/pre-commit-update.yml
index bc9b477c..1cce6a11 100644
--- a/.github/workflows/pre-commit-update.yml
+++ b/.github/workflows/pre-commit-update.yml
@@ -25,6 +25,7 @@ permissions:
 env:
   BRANCH_NAME: "autoupdates/pre-commit"
   CHANGENOTE_DIR: "./changes"
+  FORCE_COLOR: "1"
 
 defaults:
   run:
diff --git a/.github/workflows/python-package-create.yml b/.github/workflows/python-package-create.yml
index f669aeef..5ec8f7eb 100644
--- a/.github/workflows/python-package-create.yml
+++ b/.github/workflows/python-package-create.yml
@@ -36,6 +36,9 @@ on:
         description: "Name of the uploaded artifact; use for artifact retrieval."
         value: ${{ jobs.package.outputs.artifact-name }}
 
+env:
+  FORCE_COLOR: "1"
+
 jobs:
   package:
     name: Create Python Package
diff --git a/.github/workflows/towncrier-run.yml b/.github/workflows/towncrier-run.yml
index e900b179..832a1e38 100644
--- a/.github/workflows/towncrier-run.yml
+++ b/.github/workflows/towncrier-run.yml
@@ -28,6 +28,9 @@ defaults:
   run:
     shell: bash
 
+env:
+  FORCE_COLOR: "1"
+
 jobs:
   towncrier:
     name: Towncrier Checks