Consolidate test CI and add concurrency limits (#3189)

diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 97f5f01e1b54c839d5e7da00a260f8ee83857bc7..fc94dea62d9ea70cc1a4825b54dbb2e7a517ca56 100644 (file)
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -1,4 +1,4 @@
-name: Documentation Build
+name: Documentation

 
 on: [push, pull_request]
 
 
 on: [push, pull_request]
 

diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 4ee6c839b48bc131ac0d6bbcb74aa0920b8317be..a2810e25f777e24f8709b1de6c13ed80ff14ab29 100644 (file)
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -2,6 +2,10 @@ name: Fuzz
 
 on: [push, pull_request]
 
 
 on: [push, pull_request]
 

+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+

 permissions:
   contents: read
 
 permissions:
   contents: read
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1dd5ab5d35e53d789f95ab65f97c49ec9de905fb..90c48013080ac0319727bf4598aebaf3f8d87ee2 100644 (file)
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
     steps:
       - uses: actions/checkout@v3
 

-      - name: Set up Python
+      - name: Set up latest Python

         uses: actions/setup-python@v4
         with:
           python-version: "*"
         uses: actions/setup-python@v4
         with:
           python-version: "*"


@@ -27,9 +27,9 @@ jobs:
           python -m pip install -e '.[d]'
           python -m pip install tox
 
           python -m pip install -e '.[d]'
           python -m pip install tox
 

-      - name: Lint
+      - name: Run pre-commit hooks

         uses: pre-commit/action@v3.0.0
 
         uses: pre-commit/action@v3.0.0
 

-      - name: Run On Self
+      - name: Format ourselves

         run: |
           tox -e run_self
         run: |
           tox -e run_self

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7b4716c549338ad55ff995314e046cfc89335109..7cc55d1bf7696058656f87b61e136861623805d7 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,8 +11,15 @@ on:
       - "docs/**"
       - "*.md"
 
       - "docs/**"
       - "*.md"
 

+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+

 jobs:
 jobs:

-  build:
+  main:

     # We want to run on external PRs, but not on our own internal PRs as they'll be run
     # by the push to the branch. Without this if check, checks are duplicated since
     # internal PRs match both the push and pull_request events.
     # We want to run on external PRs, but not on our own internal PRs as they'll be run
     # by the push to the branch. Without this if check, checks are duplicated since
     # internal PRs match both the push and pull_request events.


@@ -35,29 +42,23 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
         with:
           python-version: ${{ matrix.python-version }}
 

-      - name: Install dependencies
+      - name: Install tox

         run: |
           python -m pip install --upgrade pip
           python -m pip install --upgrade tox
 
       - name: Unit tests
         if: "!startsWith(matrix.python-version, 'pypy')"
         run: |
           python -m pip install --upgrade pip
           python -m pip install --upgrade tox
 
       - name: Unit tests
         if: "!startsWith(matrix.python-version, 'pypy')"

-        run: |
-          tox -e ci-py -- -v --color=yes
+        run: tox -e ci-py -- -v --color=yes

 
 

-      - name: Unit tests pypy
+      - name: Unit tests (pypy)

         if: "startsWith(matrix.python-version, 'pypy')"
         if: "startsWith(matrix.python-version, 'pypy')"

-        run: |
-          tox -e ci-pypy3 -- -v --color=yes
+        run: tox -e ci-pypy3 -- -v --color=yes

 
 

-      - name: Publish coverage to Coveralls
-        # If pushed / is a pull request against main repo AND
+      - name: Upload coverage to Coveralls
+        # Upload coverage if we are on the main repository and

         # we're running on Linux (this action only supports Linux)
         # we're running on Linux (this action only supports Linux)

-        if:
-          ((github.event_name == 'push' && github.repository == 'psf/black') ||
-          github.event.pull_request.base.repo.full_name == 'psf/black') && matrix.os ==
-          'ubuntu-latest'
-
+        if: github.repository == 'psf/black' && matrix.os == 'ubuntu-latest'

         uses: AndreMiras/coveralls-python-action@v20201129
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
         uses: AndreMiras/coveralls-python-action@v20201129
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}


@@ -66,17 +67,40 @@ jobs:
           debug: true
 
   coveralls-finish:
           debug: true
 
   coveralls-finish:

-    needs: build
-    # If pushed / is a pull request against main repo
-    if:
-      (github.event_name == 'push' && github.repository == 'psf/black') ||
-      github.event.pull_request.base.repo.full_name == 'psf/black'
+    needs: main
+    if: github.repository == 'psf/black'

 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

-      - name: Coveralls finished
+      - name: Send finished signal to Coveralls

         uses: AndreMiras/coveralls-python-action@v20201129
         with:
           parallel-finished: true
           debug: true
         uses: AndreMiras/coveralls-python-action@v20201129
         with:
           parallel-finished: true
           debug: true

+
+  uvloop:
+    if:
+      github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
+      github.repository
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up latest Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "*"
+
+      - name: Install black with uvloop
+        run: |
+          python -m pip install pip --upgrade --disable-pip-version-check
+          python -m pip install -e ".[uvloop]"
+
+      - name: Format ourselves
+        run: python -m black --check src/

diff --git a/.github/workflows/uvloop_test.yml b/.github/workflows/uvloop_test.yml
deleted file mode 100644 (file)
index 9f24782..0000000
--- a/.github/workflows/uvloop_test.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: test uvloop
-
-on:
-  push:
-    paths-ignore:
-      - "docs/**"
-      - "*.md"
-
-  pull_request:
-    paths-ignore:
-      - "docs/**"
-      - "*.md"
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    # We want to run on external PRs, but not on our own internal PRs as they'll be run
-    # by the push to the branch. Without this if check, checks are duplicated since
-    # internal PRs match both the push and pull_request events.
-    if:
-      github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
-      github.repository
-
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macOS-latest]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: "*"
-
-      - name: Install latest pip
-        run: |
-          python -m pip install --upgrade pip
-
-      - name: Test uvloop Extra Install
-        run: |
-          python -m pip install -e ".[uvloop]"
-
-      - name: Format ourselves
-        run: |
-          python -m black --check src/