Merge branch '5.11.x'

johannaengland · Oct 17, 2024 · c195882 · c195882
2 parents e05d09b + a069e52
commit c195882
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - master
-      - '[1-9][0-9]*.[0-9]+.x'
+      - '[1-9][0-9]?.[0-9]+.x'
   pull_request:
   schedule: # Run daily at 08:00 CEST (06:00 UST)
     - cron: '0 6 * * *'

diff --git a/.github/workflows/towncrier.yml b/.github/workflows/towncrier.yml
@@ -14,7 +14,6 @@ jobs:
 
     - name: Install towncrier
       run: |
-        pip install -U pip
-        pip install towncrier
+        sudo apt-get install -y --no-install-recommends towncrier
     - name: Check for changelog file
       run: towncrier check --compare-with origin/master