From d65fabfff6c8587b198ac5de00fbd2043472902a Mon Sep 17 00:00:00 2001
From: Joseph Mearman <joseph@mearman.co.uk>
Date: Wed, 16 Sep 2026 23:50:42 +0100
Subject: [PATCH] merge: fold
 dependabot/github_actions/github-actions-e91bde37dc (#8) into pywr-utils
 subtree

# Conflicts:
#	engine/pywr-utils/.github/workflows/ci.yml
---
 .github/actions/test-minimal-install/action.yml | 2 +-
 .github/actions/test/action.yml                 | 2 +-
 .github/actions/typecheck/action.yml            | 2 +-
 .github/workflows/ci.yml                        | 6 +++---
 .github/workflows/gitleaks.yml                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/test-minimal-install/action.yml b/.github/actions/test-minimal-install/action.yml
index 74219af..a48926e 100644
--- a/.github/actions/test-minimal-install/action.yml
+++ b/.github/actions/test-minimal-install/action.yml
@@ -10,7 +10,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v7
       with:
         python-version: "3.12"
     - shell: bash
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index 4f32981..0e1106d 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -10,7 +10,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v7
       with:
         python-version: "3.12"
     - shell: bash
diff --git a/.github/actions/typecheck/action.yml b/.github/actions/typecheck/action.yml
index 86f4dd9..73afc03 100644
--- a/.github/actions/typecheck/action.yml
+++ b/.github/actions/typecheck/action.yml
@@ -10,7 +10,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/setup-python@v5
+    - uses: actions/setup-python@v7
       with:
         python-version: "3.12"
     - shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e276985..2c06e29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,14 +15,14 @@ jobs:
     runs-on: gha-ci-runners
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/typecheck
 
   test:
     runs-on: gha-ci-runners
     timeout-minutes: 30
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
       - uses: ./.github/actions/test
@@ -32,5 +32,5 @@ jobs:
     runs-on: gha-ci-runners
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ./.github/actions/test-minimal-install
diff --git a/.github/workflows/gitleaks.yml b/.github/workflows/gitleaks.yml
index 09a9dca..ba9bc62 100644
--- a/.github/workflows/gitleaks.yml
+++ b/.github/workflows/gitleaks.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: gha-ci-runners
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - uses: ./.github/actions/gitleaks