From b51ba9a002dd7fdfbbd3a58862f9168921e61438 Mon Sep 17 00:00:00 2001
From: Callum Leslie <git@cleslie.uk>
Date: Thu, 7 Jul 2022 22:43:30 +0100
Subject: [PATCH] chore: lint on pr, lint+fix on push to master

---
 .github/workflows/autoblack.yml | 32 ++++++++++++++++++++++++++++++++
 .github/workflows/lint.yml      | 32 ++++++--------------------------
 2 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 .github/workflows/autoblack.yml

diff --git a/.github/workflows/autoblack.yml b/.github/workflows/autoblack.yml
new file mode 100644
index 0000000..ba9cc36
--- /dev/null
+++ b/.github/workflows/autoblack.yml
@@ -0,0 +1,32 @@
+# GitHub Action that uses Black to reformat the Python code in an incoming pull request.
+# If all Python code in the pull request is compliant with Black then this Action does nothing.
+# Othewrwise, Black is run and its changes are committed back to the incoming pull request.
+# https://github.com/cclauss/autoblack
+
+name: autoblack
+on:
+  push:
+    branches: ["master"]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.9
+      - name: Install Black
+        run: pip install black
+      - name: Run black --check .
+        run: black --check .
+      - name: If needed, commit black changes to the pull request
+        if: failure()
+        run: |
+          black . --line-length 101
+          git config --global user.name 'autoblack'
+          git config --global user.email 'jasoncameron.all@gmail.com'
+          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
+          git checkout $GITHUB_HEAD_REF
+          git commit -am "fixup: Format Python code with Black"
+          git push
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 0ca5c5d..75ad759 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,30 +1,10 @@
-# GitHub Action that uses Black to reformat the Python code in an incoming pull request.
-# If all Python code in the pull request is compliant with Black then this Action does nothing.
-# Othewrwise, Black is run and its changes are committed back to the incoming pull request.
-# https://github.com/cclauss/autoblack
+name: Lint
+
+on: [pull_request]
 
-name: autoblack
-on: [pull_request, workflow_dispatch]
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python 3.7
-        uses: actions/setup-python@v1
-        with:
-          python-version: 3.9
-      - name: Install Black
-        run: pip install black
-      - name: Run black --check .
-        run: black --check .
-      - name: If needed, commit black changes to the pull request
-        if: failure()
-        run: |
-          black . --line-length 101
-          git config --global user.name 'autoblack'
-          git config --global user.email 'jasoncameron.all@gmail.com'
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
-          git checkout $GITHUB_HEAD_REF
-          git commit -am "fixup: Format Python code with Black"
-          git push
+      - uses: actions/checkout@v2
+      - uses: psf/black@stable