build: make yaml syntax more uniform

5 files changed, 35 insertions, 31 deletions

diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
index a0da0a1e..97b4d88d 100644
--- a/.github/workflows/cancel.yml
+++ b/.github/workflows/cancel.yml
@@ -4,7 +4,7 @@
 # This action finds in-progress Action jobs for the same branch, and cancels
 # them. There's little point in continuing to run superceded jobs.
 
-name: Cancel
+name: "Cancel"
 
 on:
   push:
@@ -13,7 +13,7 @@ jobs:
   cancel:
     runs-on: ubuntu-latest
     steps:
-      - name: Cancel Previous Runs
+      - name: "Cancel Previous Runs"
         uses: styfle/cancel-workflow-action@0.6.0
         with:
           access_token: ${{ github.token }}
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 632babfa..447464eb 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -4,12 +4,11 @@
 name: "Coverage"
 
 on:
+  # As currently structured, this adds too many jobs (checks?), so don't run it
+  # on pull requests yet.
   push:
     branches:
       - master
-  # as currently structured, this adds too many jobs (checks?), so don't run it
-  # on pull requests yet.
-  #pull_request:
   workflow_dispatch:
 
 defaults:
diff --git a/.github/workflows/kit.yml b/.github/workflows/kit.yml
index 437e7d31..854b4f29 100644
--- a/.github/workflows/kit.yml
+++ b/.github/workflows/kit.yml
@@ -4,7 +4,7 @@
 # Based on:
 # https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy.yml
 
-name: Build kits
+name: "Kits"
 
 on:
   workflow_dispatch:
@@ -15,88 +15,91 @@ defaults:
 
 jobs:
   build_wheels:
-    name: Build wheels on ${{ matrix.os }}
+    name: "Build wheels on ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
       fail-fast: false
 
     steps:
-      - name: Check out the repo
+      - name: "Check out the repo"
         uses: actions/checkout@v2
 
-      - name: Install Python 3.7
+      - name: "Install Python 3.7"
         uses: actions/setup-python@v2
         with:
           python-version: "3.7"
 
-      - name: Install cibuildwheel
+      - name: "Install cibuildwheel"
         run: |
           python -m pip install -c requirements/pins.pip cibuildwheel
 
-      - name: Install Visual C++ for Python 2.7
+      - name: "Install Visual C++ for Python 2.7"
         if: runner.os == 'Windows'
         run: |
           choco install vcpython27 -f -y
 
-      - name: Build wheels
+      - name: "Build wheels"
         env:
           # Don't build wheels for PyPy.
           CIBW_SKIP: pp*
         run: |
           python -m cibuildwheel --output-dir wheelhouse
 
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v2
         with:
           name: dist
           path: ./wheelhouse/*.whl
 
   build_sdist:
-    name: Build source distribution
+    name: "Build source distribution"
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
+      - name: "Check out the repo"
         uses: actions/checkout@v2
 
-      - name: Install Python 3.7
+      - name: "Install Python 3.7"
         uses: actions/setup-python@v2
         with:
           python-version: "3.7"
 
-      - name: Build sdist
+      - name: "Build sdist"
         run: |
           python setup.py sdist
 
-      - name: Upload sdist
+      - name: "Upload sdist"
         uses: actions/upload-artifact@v2
         with:
           name: dist
           path: dist/*.tar.gz
 
   build_pypy:
-    name: Build PyPy wheels
+    name: "Build PyPy wheels"
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
+      - name: "Check out the repo"
         uses: actions/checkout@v2
 
-      - name: Install PyPy
+      - name: "Install PyPy"
         uses: actions/setup-python@v2
         with:
           python-version: "pypy3"
 
-      - name: Install requirements
+      - name: "Install requirements"
         run: |
           pypy3 -m pip install -r requirements/wheel.pip
 
-      - name: Build wheels
+      - name: "Build wheels"
         run: |
           pypy3 setup.py bdist_wheel --python-tag pp36
           pypy3 setup.py bdist_wheel --python-tag pp37
 
-      - name: Upload wheels
+      - name: "Upload wheels"
         uses: actions/upload-artifact@v2
         with:
           name: dist
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index fbd3d832..1a1b7f03 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -1,11 +1,12 @@
 # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
 
-name: "Quality checks"
+name: "Quality"
 
 on:
   push:
-    branches: ["master"]
+    branches:
+      - master
   pull_request:
   workflow_dispatch:
 
@@ -15,7 +16,7 @@ defaults:
 
 jobs:
   lint:
-    name: Pylint etc
+    name: "Pylint etc"
     # Because pylint can report different things on different OS's (!)
     # (https://github.com/PyCQA/pylint/issues/3489), run this on Mac where local
     # pylint gets run.
@@ -42,7 +43,7 @@ jobs:
           python -m tox -e lint
 
   doc:
-    name: Build docs
+    name: "Build docs"
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index 25fcd73d..24bd926e 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -1,11 +1,12 @@
 # Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0
 # For details: https://github.com/nedbat/coveragepy/blob/master/NOTICE.txt
 
-name: "Test Suite"
+name: "Tests"
 
 on:
   push:
-    branches: ["master"]
+    branches:
+      - master
   pull_request:
   workflow_dispatch: