Skip to content

Commit 9d4a1a4

Browse files
authored
CI: Include Python version in cache.config key (#111410)
* Include Python version in cache.config key, after Python setup * Remove EOL 3.7 from branch triggers
1 parent 9dc4fb8 commit 9d4a1a4

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ on:
1313
- '3.10'
1414
- '3.9'
1515
- '3.8'
16-
- '3.7'
1716
pull_request:
1817
branches:
1918
- 'main'
@@ -22,7 +21,6 @@ on:
2221
- '3.10'
2322
- '3.9'
2423
- '3.8'
25-
- '3.7'
2624

2725
permissions:
2826
contents: read
@@ -128,14 +126,14 @@ jobs:
128126
if: needs.check_source.outputs.run_tests == 'true'
129127
steps:
130128
- uses: actions/checkout@v4
129+
- uses: actions/setup-python@v4
130+
with:
131+
python-version: '3.x'
131132
- name: Restore config.cache
132133
uses: actions/cache@v3
133134
with:
134135
path: config.cache
135-
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}
136-
- uses: actions/setup-python@v4
137-
with:
138-
python-version: '3.x'
136+
key: ${{ github.job }}-${{ runner.os }}-${{ needs.check_source.outputs.config_hash }}-${{ env.pythonLocation }}
139137
- name: Install Dependencies
140138
run: sudo ./.github/workflows/posix-deps-apt.sh
141139
- name: Add ccache to PATH
@@ -280,7 +278,7 @@ jobs:
280278
- uses: actions/checkout@v4
281279
- name: Register gcc problem matcher
282280
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
283-
- name: Install Dependencies
281+
- name: Install dependencies
284282
run: sudo ./.github/workflows/posix-deps-apt.sh
285283
- name: Configure OpenSSL env vars
286284
run: |

0 commit comments

Comments
 (0)