From 9b09b19e5f075b363707a2f2bfe8b2276f733930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Gir=C3=A3o=20Serr=C3=A3o?=
 <5621605+rodrigogiraoserrao@users.noreply.github.com>
Date: Tue, 16 May 2023 10:17:45 +0100
Subject: [PATCH 1/2] Update workflows.

This caches the virtual environment so we don't have to download it every time (the cache can be cleared from the repository > Actions > Caches (on the left).

We also split black formatting into a separate workflow.
This means we can run black ONLY when *.py files are changed.
It also means all other testing jobs don't need to _also_ check formatting.
---
 .github/workflows/black_format.yml  | 21 +++++++++++++++++++++
 .github/workflows/comment.yml       |  5 +++--
 .github/workflows/new_issue.yml     |  3 ++-
 .github/workflows/pythonpackage.yml | 25 +++++++++++++------------
 4 files changed, 39 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/black_format.yml

diff --git a/.github/workflows/black_format.yml b/.github/workflows/black_format.yml
new file mode 100644
index 000000000..aba9ba1f5
--- /dev/null
+++ b/.github/workflows/black_format.yml
@@ -0,0 +1,21 @@
+
+name: Black format check
+
+on:
+  pull_request:
+    paths:
+      - '**.py'
+
+jobs:
+  black-format-check:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v3.5.2
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4.6.0
+        with:
+          python-version: 3.11
+      - name: Install black
+        run: python -m pip install black
+      - name: Run black
+        run: black --check src
diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
index 46cf1677f..d26259360 100644
--- a/.github/workflows/comment.yml
+++ b/.github/workflows/comment.yml
@@ -1,7 +1,8 @@
-name: issues
+name: Closed issue comment
 on:
   issues:
     types: [closed]
+
 jobs:
   add-comment:
     runs-on: ubuntu-latest
@@ -14,5 +15,5 @@ jobs:
           issue-number: ${{ github.event.issue.number }}
           body: |
             Don't forget to [star](https://github.com/Textualize/textual) the repository!
-            
+
             Follow [@textualizeio](https://twitter.com/textualizeio) for Textual updates.
diff --git a/.github/workflows/new_issue.yml b/.github/workflows/new_issue.yml
index 3dd9d9a3a..cb55213ec 100644
--- a/.github/workflows/new_issue.yml
+++ b/.github/workflows/new_issue.yml
@@ -1,7 +1,8 @@
-name: issues
+name: FAQ issue comment
 on:
   issues:
     types: [opened]
+
 jobs:
   add-comment:
     if: ${{ !contains( 'willmcgugan,darrenburns,davep,rodrigogiraoserrao', github.actor ) }}
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 2891b4bcf..79504215b 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -21,27 +21,28 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-          architecture: x64
-      - name: Install and configure Poetry
+      - uses: actions/checkout@v3.5.2
+      - name: Install and configure Poetry  # This could be cached, too...
         uses: snok/install-poetry@v1.3.3
         with:
           version: 1.4.2
           virtualenvs-in-project: true
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4.6.0
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v3
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }}
       - name: Install dependencies
         run: poetry install --extras "dev"
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-      - name: Format check with black
-        run: |
-          source $VENV
-          make format-check
 #      - name: Typecheck with mypy
 #        run: |
-#          source $VENV
 #          make typecheck
       - name: Test with pytest
         run: |

From a9a04dc37a9dad6c1a47cf2a842e109ea2b9ffbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Gir=C3=A3o=20Serr=C3=A3o?=
 <5621605+rodrigogiraoserrao@users.noreply.github.com>
Date: Tue, 16 May 2023 11:43:31 +0100
Subject: [PATCH 2/2] Run workflows when they are changed.

Related comments: https://github.com/Textualize/textual/pull/2577\#issuecomment-1549411724
---
 .github/workflows/black_format.yml  | 1 +
 .github/workflows/pythonpackage.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/black_format.yml b/.github/workflows/black_format.yml
index aba9ba1f5..063068c35 100644
--- a/.github/workflows/black_format.yml
+++ b/.github/workflows/black_format.yml
@@ -4,6 +4,7 @@ name: Black format check
 on:
   pull_request:
     paths:
+      - '.github/workflows/black_format.yml'
       - '**.py'
 
 jobs:
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 79504215b..27f36d406 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -3,6 +3,7 @@ name: Test Textual module
 on:
   pull_request:
     paths:
+      - '.github/workflows/pythonpackage.yml'
       - '**.py'
       - '**.pyi'
       - '**.css'