From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 28 Oct 2023 07:51:57 +0000 (+0200)
Subject: [3.11] CI: Include Python version in cache.config key (GH-111410) (#111422)
X-Git-Tag: v3.11.7~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da1736b06a40dc2af4ecb587effd3a119cfcca80;p=thirdparty%2FPython%2Fcpython.git

[3.11] CI: Include Python version in cache.config key (GH-111410) (#111422)

CI: Include Python version in cache.config key (GH-111410)

* Include Python version in cache.config key, after Python setup

* Remove EOL 3.7 from branch triggers
(cherry picked from commit 9d4a1a480b65196c3aabbcd2d165d1fb86d0c8e5)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cebcc3ef182b..71901d4cab2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,6 @@ on:
     - '3.10'
     - '3.9'
     - '3.8'
-    - '3.7'
   pull_request:
     branches:
     - 'main'
@@ -20,7 +19,6 @@ on:
     - '3.10'
     - '3.9'
     - '3.8'
-    - '3.7'
 
 permissions:
   contents: read
@@ -144,14 +142,14 @@ jobs:
     if: needs.check_source.outputs.run_tests == 'true'
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
       - name: Restore config.cache
         uses: actions/cache@v3
         with:
           path: config.cache
-          key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+          key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
       - name: Install Dependencies
         run: sudo ./.github/workflows/posix-deps-apt.sh
       - name: Add ccache to PATH
@@ -296,7 +294,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Register gcc problem matcher
       run: echo "::add-matcher::.github/problem-matchers/gcc.json"
-    - name: Install Dependencies
+    - name: Install dependencies
       run: sudo ./.github/workflows/posix-deps-apt.sh
     - name: Configure OpenSSL env vars
       run: |