From 80f39400be0b523334fca173a8434569b7fa4e64 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 15 Nov 2023 15:24:01 +0000 Subject: [PATCH] Colored pre-commit output Signed-off-by: Pedro Algarvio --- .github/workflows/ci.yml | 1 + .github/workflows/nightly.yml | 1 + .github/workflows/pre-commit-action.yml | 3 +++ .github/workflows/scheduled.yml | 1 + .github/workflows/staging.yml | 1 + .github/workflows/templates/ci.yml.jinja | 1 + 6 files changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c524934030f..34c4d8611bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -350,6 +350,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} env: SKIP: lint-salt,lint-tests + PRE_COMMIT_COLOR: always run: | # Run it twice so that pre-commit can fix anything that can be automatically fixed. git commit -am "Release v${{ needs.prepare-workflow.outputs.salt-version }}" || \ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a0308e5b785..34e055d4974 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -399,6 +399,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} env: SKIP: lint-salt,lint-tests + PRE_COMMIT_COLOR: always run: | # Run it twice so that pre-commit can fix anything that can be automatically fixed. git commit -am "Release v${{ needs.prepare-workflow.outputs.salt-version }}" || \ diff --git a/.github/workflows/pre-commit-action.yml b/.github/workflows/pre-commit-action.yml index a4f97ae5d33..2847ffe64d0 100644 --- a/.github/workflows/pre-commit-action.yml +++ b/.github/workflows/pre-commit-action.yml @@ -26,6 +26,9 @@ jobs: container: image: ghcr.io/saltstack/salt-ci-containers/python:3.10 + env: + PRE_COMMIT_COLOR: always + steps: - name: Install System Deps diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index a801b5a8bc2..a267fcb43f7 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -384,6 +384,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} env: SKIP: lint-salt,lint-tests + PRE_COMMIT_COLOR: always run: | # Run it twice so that pre-commit can fix anything that can be automatically fixed. git commit -am "Release v${{ needs.prepare-workflow.outputs.salt-version }}" || \ diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3a44e39b57d..88c297dd5d0 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -389,6 +389,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} env: SKIP: lint-salt,lint-tests + PRE_COMMIT_COLOR: always run: | # Run it twice so that pre-commit can fix anything that can be automatically fixed. git commit -am "Release v${{ needs.prepare-workflow.outputs.salt-version }}" || \ diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 79b322cc812..b3d771891e1 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -155,6 +155,7 @@ if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} env: SKIP: lint-salt,lint-tests + PRE_COMMIT_COLOR: always run: | # Run it twice so that pre-commit can fix anything that can be automatically fixed. git commit -am "Release v${{ needs.prepare-workflow.outputs.salt-version }}" || \