From cae6f5c3b1f5f46f151e038f64ba97ddb368f5e9 Mon Sep 17 00:00:00 2001
From: Natalia <124304+nessita@users.noreply.github.com>
Date: Tue, 25 Nov 2025 22:18:50 -0300
Subject: [PATCH] [5.1.x] Added timeout-minutes directive to all GitHub Actions
 workflows.

GitHub Actions defaults to a 360-minute (6-hour) timeout. We've had jobs
hang due to issues in the parallel test runner, causing them to run for
the full 6 hours. This wastes resources and negatively impacts CI
availability, so explicit timeouts have been added to prevent
long-running hangs.

Backport of e48527f91d341c85a652499a5baaf725d36ae54f from main.
---
 .github/workflows/benchmark.yml             | 1 +
 .github/workflows/check_commit_messages.yml | 1 +
 .github/workflows/docs.yml                  | 2 ++
 .github/workflows/linters.yml               | 4 ++++
 .github/workflows/new_contributor_pr.yml    | 1 +
 .github/workflows/python_matrix.yml         | 2 ++
 .github/workflows/schedule_tests.yml        | 4 ++++
 .github/workflows/schedules.yml             | 1 +
 .github/workflows/screenshots.yml           | 1 +
 .github/workflows/selenium.yml              | 2 ++
 .github/workflows/tests.yml                 | 2 ++
 11 files changed, 21 insertions(+)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 9c3735f848..2116605a22 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -11,6 +11,7 @@ jobs:
   Run_benchmarks:
     if: contains(github.event.pull_request.labels.*.name, 'benchmark')
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - name: Checkout Benchmark Repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/check_commit_messages.yml b/.github/workflows/check_commit_messages.yml
index a4594d611c..16b67ea9a3 100644
--- a/.github/workflows/check_commit_messages.yml
+++ b/.github/workflows/check_commit_messages.yml
@@ -15,6 +15,7 @@ jobs:
   check-commit-prefix:
     if: startsWith(github.event.pull_request.base.ref, 'stable/')
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 63585bb42f..6b0458a35f 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -23,6 +23,7 @@ jobs:
   docs:
     runs-on: ubuntu-24.04
     name: docs
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -43,6 +44,7 @@ jobs:
   blacken-docs:
     runs-on: ubuntu-latest
     name: blacken-docs
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index b16acba720..a0273d3d1f 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -21,6 +21,7 @@ jobs:
   flake8:
     name: flake8
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -40,6 +41,7 @@ jobs:
 
   isort:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -59,6 +61,7 @@ jobs:
 
   black:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -69,6 +72,7 @@ jobs:
 
   zizmor:
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v5
diff --git a/.github/workflows/new_contributor_pr.yml b/.github/workflows/new_contributor_pr.yml
index 3602abf109..7a28b6cdde 100644
--- a/.github/workflows/new_contributor_pr.yml
+++ b/.github/workflows/new_contributor_pr.yml
@@ -15,6 +15,7 @@ jobs:
     if: github.repository == 'django/django'
     name: Hello new contributor
     runs-on: ubuntu-latest
+    timeout-minutes: 60
     steps:
       - uses: actions/first-interaction@v1
         with:
diff --git a/.github/workflows/python_matrix.yml b/.github/workflows/python_matrix.yml
index 979025dd07..afd3f696d4 100644
--- a/.github/workflows/python_matrix.yml
+++ b/.github/workflows/python_matrix.yml
@@ -20,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       python_versions_output: ${{ steps.set-matrix.outputs.python_versions }}
+    timeout-minutes: 60
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -36,6 +37,7 @@ jobs:
     strategy:
       matrix:
         python-version: ${{ fromJson(needs.define-matrix.outputs.python_versions_output) }}
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/schedule_tests.yml b/.github/workflows/schedule_tests.yml
index 87c9928a9a..cf0a9782cb 100644
--- a/.github/workflows/schedule_tests.yml
+++ b/.github/workflows/schedule_tests.yml
@@ -21,6 +21,7 @@ jobs:
           - '3.12'
           - '3.13'
     name: Windows, SQLite, Python ${{ matrix.python-version }}
+    timeout-minutes: 60
     continue-on-error: true
     steps:
       - name: Checkout
@@ -42,6 +43,7 @@ jobs:
   pyc-only:
     runs-on: ubuntu-latest
     name: Byte-compiled Django with no source files (only .pyc files)
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -70,6 +72,7 @@ jobs:
   pypy-sqlite:
     runs-on: ubuntu-latest
     name: Ubuntu, SQLite, PyPy3.10
+    timeout-minutes: 60
     continue-on-error: true
     steps:
       - name: Checkout
@@ -93,6 +96,7 @@ jobs:
   pypy-postgresql:
     runs-on: ubuntu-latest
     name: Ubuntu, PostgreSQL, PyPy3.10
+    timeout-minutes: 60
     continue-on-error: true
     services:
       postgres:
diff --git a/.github/workflows/schedules.yml b/.github/workflows/schedules.yml
index 041a0b3362..3674d18cdf 100644
--- a/.github/workflows/schedules.yml
+++ b/.github/workflows/schedules.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: schedules
     name: Trigger Full Build
+    timeout-minutes: 60
     # Only trigger on the main Django repository
     if: (github.event_name == 'schedule' && github.repository == 'django/django') || (github.event_name != 'schedule')
     strategy:
diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml
index 4c67c7fc72..5020631d36 100644
--- a/.github/workflows/screenshots.yml
+++ b/.github/workflows/screenshots.yml
@@ -18,6 +18,7 @@ jobs:
     if: contains(join(github.event.pull_request.labels.*.name, '|'), 'screenshots')
     runs-on: ubuntu-latest
     name: Screenshots
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/selenium.yml b/.github/workflows/selenium.yml
index c214e431de..e6969893da 100644
--- a/.github/workflows/selenium.yml
+++ b/.github/workflows/selenium.yml
@@ -18,6 +18,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'selenium')
     runs-on: ubuntu-latest
     name: SQLite
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -43,6 +44,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'selenium')
     runs-on: ubuntu-latest
     name: PostgreSQL
+    timeout-minutes: 60
     services:
       postgres:
         image: postgres:13-alpine
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f5881a1e8b..d04b360019 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,6 +25,7 @@ jobs:
         python-version:
           - '3.13'
     name: Windows, SQLite, Python ${{ matrix.python-version }}
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -45,6 +46,7 @@ jobs:
   javascript-tests:
     runs-on: ubuntu-latest
     name: JavaScript tests
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@v4