Merge pull request #36 from rmartin16/color

Use `FORCE_COLOR` to enable colored output in CI
beeware · May 9, 2023 · 3c11d0e · 3c11d0e
2 parents 61b2c05 + eeeda1c
commit 3c11d0e
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git 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
@@ -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
@@ -25,6 +25,7 @@ permissions:
 env:
   BRANCH_NAME: "autoupdates/pre-commit"
   CHANGENOTE_DIR: "./changes"
+  FORCE_COLOR: "1"
 
 defaults:
   run:
@@ -64,7 +65,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
@@ -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
@@ -71,11 +74,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
@@ -28,6 +28,9 @@ defaults:
   run:
     shell: bash
 
+env:
+  FORCE_COLOR: "1"
+
 jobs:
   towncrier:
     name: Towncrier Checks
@@ -64,4 +67,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