From e78fa7a94b9d5f544dacf03271d71068a44057c7 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 18:48:44 -0500 Subject: [PATCH 01/13] Do all checks in one GHA job --- .github/workflows/ci.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a7d21b0..eb1bc08d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: jobs: test: - name: ${{ matrix.task.name}} - ${{ matrix.python.name }} + name: Test - ${{ matrix.python.name }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -26,9 +26,6 @@ jobs: - name: CPython 3.7 tox: py37 action: 3.7 - task: - - name: Test - tox: tests steps: - uses: actions/checkout@v2 @@ -48,10 +45,10 @@ jobs: - name: Codecov run: | - codecov -n "GitHub Actions - ${{ matrix.task.name}} - ${{ matrix.python.name }}" + codecov -n "GitHub Actions - Test - ${{ matrix.python.name }}" check: - name: ${{ matrix.task.name}} - ${{ matrix.python.name }} + name: Check - ${{ matrix.python.name }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -60,13 +57,6 @@ jobs: - name: CPython 3.6 tox: py36 action: 3.6 - task: - - name: Flake8 - tox: flake8 - - name: Check Manifest - tox: check-manifest - - name: Check Newsfragment - tox: check-newsfragment steps: - uses: actions/checkout@v2 @@ -83,8 +73,14 @@ jobs: - name: Install dependencies run: python -m pip install --upgrade pip tox - - name: Check - run: tox -c tox.ini -e ${{ matrix.task.tox }} + - name: Lint + run: tox -c tox.ini -e flake8 + + - name: Manifest + run: tox -c tox.ini -e check-manifest + + - name: Newsfragment + run: tox -c tox.ini -e check-newsfragment all: name: All From e3bb91c981c0f6f5a6502538c86a9d4c1190cf0a Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 18:49:48 -0500 Subject: [PATCH 02/13] Remove the check matrix entirely --- .github/workflows/ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb1bc08d..5ba7f94f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,23 +50,16 @@ jobs: check: name: Check - ${{ matrix.python.name }} runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python: - - name: CPython 3.6 - tox: py36 - action: 3.6 steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Set up ${{ matrix.python.name }} + - name: Set up CPython 3.6 uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python.action }} + python-version: 3.6 - uses: twisted/python-info-action@v1.0.1 From 2aaf78e14e52c418620bce0c1c4e0d2c11de3815 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 18:50:22 -0500 Subject: [PATCH 03/13] Remove custom name for setup-python step in check job --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ba7f94f..35124b01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,8 +56,7 @@ jobs: with: fetch-depth: 0 - - name: Set up CPython 3.6 - uses: actions/setup-python@v2 + - uses: actions/setup-python@v2 with: python-version: 3.6 From 2c93934ba4d84142af64edd2da16720ece65dfbf Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 21:00:05 -0500 Subject: [PATCH 04/13] Add 292.misc.rst --- src/towncrier/newsfragments/292.misc.rst | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/towncrier/newsfragments/292.misc.rst diff --git a/src/towncrier/newsfragments/292.misc.rst b/src/towncrier/newsfragments/292.misc.rst new file mode 100644 index 00000000..e69de29b From 7df3da4756298ac824f4b88eedbe4e59b0c60893 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 21:10:57 -0500 Subject: [PATCH 05/13] cleanup after merge --- .github/workflows/ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77d79ac9..1f7ef56c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,9 +43,6 @@ jobs: - name: PyPy 3 tox: pypy3 action: pypy3 - task: - - name: Test - tox: tests steps: - uses: actions/checkout@v2 @@ -68,7 +65,7 @@ jobs: codecov -n "GitHub Actions - Test - ${{ matrix.os.name }} ${{ matrix.python.name }}" check: - name: Check - ${{ matrix.python.name }} + name: Check runs-on: ubuntu-latest steps: From 4ddc02f8a77a4ec7902b131e52eb98354eb1ca88 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 22:01:53 -0500 Subject: [PATCH 06/13] if: always() --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f7ef56c..2d7885cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,12 +85,15 @@ jobs: run: python -m pip install --upgrade pip tox - name: Lint + if: always() run: tox -c tox.ini -e flake8 - name: Manifest + if: always() run: tox -c tox.ini -e check-manifest - name: Newsfragment + if: always() run: tox -c tox.ini -e check-newsfragment all: From 724c8f94046f44e0111255c1a031d6d33fb7b8bc Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 22:03:08 -0500 Subject: [PATCH 07/13] revert this intentional failure --- src/towncrier/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/towncrier/__init__.py b/src/towncrier/__init__.py index 78db5995..9fd91689 100644 --- a/src/towncrier/__init__.py +++ b/src/towncrier/__init__.py @@ -8,3 +8,5 @@ from ._version import __version__ __all__ = ["__version__"] + +let_us_fail_lint = ["this", "that", "more", "and", "always", "but", "this", "is", "a", "silly", "way", "but", "it", "should", "work"] From 05fec2af9a668521f557506a2e63ec2660475a7c Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 22:05:29 -0500 Subject: [PATCH 08/13] Revert "revert this intentional failure" This reverts commit 724c8f94046f44e0111255c1a031d6d33fb7b8bc. --- src/towncrier/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/towncrier/__init__.py b/src/towncrier/__init__.py index 9fd91689..78db5995 100644 --- a/src/towncrier/__init__.py +++ b/src/towncrier/__init__.py @@ -8,5 +8,3 @@ from ._version import __version__ __all__ = ["__version__"] - -let_us_fail_lint = ["this", "that", "more", "and", "always", "but", "this", "is", "a", "silly", "way", "but", "it", "should", "work"] From 133516ef0bf00ca30970e13ef2505ec61b69e0c2 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 22:20:58 -0500 Subject: [PATCH 09/13] Revert "Revert "revert this intentional failure"" This reverts commit 05fec2af9a668521f557506a2e63ec2660475a7c. --- src/towncrier/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/towncrier/__init__.py b/src/towncrier/__init__.py index 78db5995..9fd91689 100644 --- a/src/towncrier/__init__.py +++ b/src/towncrier/__init__.py @@ -8,3 +8,5 @@ from ._version import __version__ __all__ = ["__version__"] + +let_us_fail_lint = ["this", "that", "more", "and", "always", "but", "this", "is", "a", "silly", "way", "but", "it", "should", "work"] From a41272ac0f8eeb3763b0e28091f9eedf2e3ba1bd Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 22:21:05 -0500 Subject: [PATCH 10/13] try another route --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d7885cf..158135ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,18 +82,19 @@ jobs: - uses: twisted/python-info-action@v1.0.1 - name: Install dependencies + id: last_step_before_checks run: python -m pip install --upgrade pip tox - name: Lint - if: always() + if: ${{ steps.last_step_before_checks.conclusion }} == "success" run: tox -c tox.ini -e flake8 - name: Manifest - if: always() + if: ${{ steps.last_step_before_checks.conclusion }} == "success" run: tox -c tox.ini -e check-manifest - name: Newsfragment - if: always() + if: ${{ steps.last_step_before_checks.conclusion }} == "success" run: tox -c tox.ini -e check-newsfragment all: From 9164b58f6e908a7e6627217f868ab999d527b9b0 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sat, 5 Dec 2020 22:25:15 -0500 Subject: [PATCH 11/13] outcome? --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 158135ca..c614422b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -86,15 +86,15 @@ jobs: run: python -m pip install --upgrade pip tox - name: Lint - if: ${{ steps.last_step_before_checks.conclusion }} == "success" + if: ${{ steps.last_step_before_checks.outcome }} == "success" run: tox -c tox.ini -e flake8 - name: Manifest - if: ${{ steps.last_step_before_checks.conclusion }} == "success" + if: ${{ steps.last_step_before_checks.outcome }} == "success" run: tox -c tox.ini -e check-manifest - name: Newsfragment - if: ${{ steps.last_step_before_checks.conclusion }} == "success" + if: ${{ steps.last_step_before_checks.outcome }} == "success" run: tox -c tox.ini -e check-newsfragment all: From 7fe3611d949ea8a64cd16ecfafe566e2e356cf1a Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sun, 6 Dec 2020 22:46:21 -0500 Subject: [PATCH 12/13] back to if: always() --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 813df1b9..4df269ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,15 +96,15 @@ jobs: run: python -m pip install --upgrade pip tox - name: Lint - if: ${{ steps.last_step_before_checks.outcome }} == "success" + if: always() run: tox -c tox.ini -e flake8 - name: Manifest - if: ${{ steps.last_step_before_checks.outcome }} == "success" + if: always() run: tox -c tox.ini -e check-manifest - name: Newsfragment - if: ${{ steps.last_step_before_checks.outcome }} == "success" + if: always() run: tox -c tox.ini -e check-newsfragment all: From 4c95802efd79981443f5823d33804454d139edb9 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sun, 6 Dec 2020 23:18:58 -0500 Subject: [PATCH 13/13] remove lint-failing example --- src/towncrier/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/towncrier/__init__.py b/src/towncrier/__init__.py index 9fd91689..78db5995 100644 --- a/src/towncrier/__init__.py +++ b/src/towncrier/__init__.py @@ -8,5 +8,3 @@ from ._version import __version__ __all__ = ["__version__"] - -let_us_fail_lint = ["this", "that", "more", "and", "always", "but", "this", "is", "a", "silly", "way", "but", "it", "should", "work"]