From 54f6bf3f79bdf01bee8d2d60cd16849aef932182 Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 24 Jun 2024 15:51:44 -0400 Subject: [PATCH 1/4] Explicitly run tox lint testenv --- .github/workflows/regression.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 6b17cb351..8d22c8f01 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -47,4 +47,6 @@ jobs: pip install tox pip install tox-gh-actions - name: Run tox - run: tox + run: | + tox -e lint + tox From f86bdc1f8448dcdc9cabf76b1a6b0da0f5bce343 Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 24 Jun 2024 15:57:37 -0400 Subject: [PATCH 2/4] Add yaml to triggers --- .github/workflows/regression.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 8d22c8f01..1294e342a 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -8,6 +8,8 @@ on: - '**/*.py' - '**/*.ini' - '**/*.toml' + - '**/*.yml' + - '**/*.yaml' push: branches: [ master ] paths: @@ -15,6 +17,8 @@ on: - '**/*.py' - '**/*.ini' - '**/*.toml' + - '**/*.yml' + - '**/*.yaml' jobs: tox-matrix: From c58b030456847a4a2dbe69b868fd8ac488a53be5 Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 24 Jun 2024 16:06:33 -0400 Subject: [PATCH 3/4] Break linting env out --- .github/workflows/regression.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 1294e342a..8a8d678a3 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -21,10 +21,25 @@ on: - '**/*.yaml' jobs: + tox-lint: + # Linting is ran through tox to ensure that the same linter is used by local runners + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up linting environment + uses: actions/setup-python@v5 + with: + python-version: '3.x' + - name: Install tox and related dependencies + run: | + python -m pip install --upgrade pip + pip install tox + - name: Run tox linting environment + run: tox -e lint tox-matrix: runs-on: ${{ matrix.os }} strategy: - fail-fast: false # We want to know what version it fails on + fail-fast: false # We want to know what specicic versions it fails on matrix: os: [ ubuntu-latest, @@ -38,7 +53,6 @@ jobs: '3.11', '3.12', ] - steps: - uses: actions/checkout@v4 - name: Set up environment ${{ matrix.python-version }} @@ -51,6 +65,4 @@ jobs: pip install tox pip install tox-gh-actions - name: Run tox - run: | - tox -e lint - tox + run: tox From 255c9dea8c1d4407fe9132ad42a1ffd9c42cf5cd Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 24 Jun 2024 16:15:12 -0400 Subject: [PATCH 4/4] Swap yaml wildcard for workflow --- .github/workflows/regression.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 8a8d678a3..34b6f8c7d 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -4,21 +4,19 @@ on: pull_request: branches: [ master ] paths: + - '.github/workflows/regression.yml' - '**/*.json' - '**/*.py' - '**/*.ini' - '**/*.toml' - - '**/*.yml' - - '**/*.yaml' push: branches: [ master ] paths: + - '.github/workflows/regression.yml' - '**/*.json' - '**/*.py' - '**/*.ini' - '**/*.toml' - - '**/*.yml' - - '**/*.yaml' jobs: tox-lint: