Skip to content

Commit 3889750

Browse files
committed
Updated dependencies of the different workflows.
Also, fixed the half-baked WSL workflow with a quite complex matrix
1 parent 610f1c7 commit 3889750

3 files changed

Lines changed: 35 additions & 37 deletions

File tree

.github/workflows/pip-audit.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
13+
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
1414
name: pip-audit python ${{ matrix.python-version }}
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
- uses: actions/setup-python@v6
1818
with:
1919
python-version: ${{ matrix.python-version }}
@@ -64,7 +64,7 @@ jobs:
6464
fi
6565
cat audit-report-${{ matrix.python-version }}.md >> "$GITHUB_STEP_SUMMARY"
6666
fi
67-
- uses: actions/upload-artifact@v4
67+
- uses: actions/upload-artifact@v6
6868
with:
6969
name: audit-${{ matrix.python-version }}
7070
retention-days: 2
@@ -83,8 +83,8 @@ jobs:
8383
- name: Get analysis timestamp
8484
id: timestamp
8585
run: echo "timestamp=$(date -Is)" >> "$GITHUB_OUTPUT"
86-
- uses: actions/checkout@v5
87-
- uses: actions/download-artifact@v5
86+
- uses: actions/checkout@v6
87+
- uses: actions/download-artifact@v7
8888
id: download
8989
with:
9090
pattern: audit-*
@@ -122,7 +122,7 @@ jobs:
122122
echo "skip=$skip" >> "$GITHUB_OUTPUT"
123123
- name: Create Pull Request
124124
id: cpr
125-
uses: peter-evans/create-pull-request@v7
125+
uses: peter-evans/create-pull-request@v8
126126
if: steps.move.outputs.skip == 'false'
127127
with:
128128
title: Updated constraints due security reasons (triggered on ${{ steps.timestamp.outputs.timestamp }} by ${{ github.sha }})

.github/workflows/pre-commit.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ on:
66
push:
77
branches: [exec]
88
paths-ignore:
9-
- 'constraints-*.txt'
9+
- 'constraints-*[0-9].txt'
1010

1111
jobs:
1212
pre-commit:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
16+
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
1717
name: Pre-commit python ${{ matrix.python-version }}
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 100
2222
- uses: actions/setup-python@v6
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}.txt-relaxed
5656
- name: MyPy cache
57-
uses: actions/cache@v4
57+
uses: actions/cache@v5
5858
with:
5959
path: '.mypy_cache/[0-9]*'
6060
key: mypy-${{ matrix.python-version }}
@@ -64,7 +64,7 @@ jobs:
6464
with:
6565
extra_args: --all -c .pre-commit-config.yaml
6666
# - name: 'pre-commit (custom Python ${{ matrix.python-version }})'
67-
# uses: pre-commit/action@v3.0.0
67+
# uses: pre-commit/action@v3.0.1
6868
# if: ${{ matrix.python-version == '3.6' }}
6969
# with:
7070
# extra_args: --all -c .pre-commit-config-gh-${{ matrix.python-version }}.yaml
@@ -73,7 +73,6 @@ jobs:
7373
pytest --cov=treecript
7474
- name: Get transitive dependencies licences
7575
id: license_check_print_report
76-
# uses: pilosus/action-pip-license-checker@v1.0.0
7776
# continue-on-error: true
7877
uses: pilosus/action-pip-license-checker@v3.1.0
7978
with:
@@ -88,7 +87,7 @@ jobs:
8887
- name: Print licences report
8988
if: ${{ always() }}
9089
run: echo "${{ steps.license_check_print_report.outputs.report }}"
91-
- uses: actions/upload-artifact@v4
90+
- uses: actions/upload-artifact@v6
9291
with:
9392
name: pre-commit-${{ matrix.python-version }}
9493
retention-days: 2
@@ -105,8 +104,8 @@ jobs:
105104
- name: Get analysis timestamp
106105
id: timestamp
107106
run: echo "timestamp=$(date -Is)" >> "$GITHUB_OUTPUT"
108-
- uses: actions/checkout@v5
109-
- uses: actions/download-artifact@v5
107+
- uses: actions/checkout@v6
108+
- uses: actions/download-artifact@v7
110109
id: download
111110
with:
112111
pattern: pre-commit-*
@@ -132,7 +131,7 @@ jobs:
132131
echo "skip=$skip" >> "$GITHUB_OUTPUT"
133132
- name: Create Pull Request
134133
id: cpr
135-
uses: peter-evans/create-pull-request@v7
134+
uses: peter-evans/create-pull-request@v8
136135
if: steps.move.outputs.skip == 'false'
137136
with:
138137
title: Updated constraints (triggered on ${{ steps.timestamp.outputs.timestamp }} by ${{ github.sha }})

.github/workflows/pre-commit_wsl.yml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
#push:
77
# branches: [exec]
88
# paths-ignore:
9-
# - 'constraints-*.txt'
9+
# - 'constraints-*_*-wsl.txt'
1010

1111
jobs:
1212
pre-commit:
1313
runs-on: windows-2022
1414
strategy:
1515
matrix:
1616
# python-version: [ "3.12" ]
17-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
17+
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
1818
distribution: [ "Ubuntu-22.04", "Ubuntu-24.04" ]
1919
max-parallel: 1
2020
name: Pre-commit WSL python ${{ matrix.python-version }} dist ${{ matrix.distribution }}
@@ -46,7 +46,7 @@ jobs:
4646
python3-openssl
4747
- name: Cache pyenv and pip in WSL
4848
id: cache-pyenv
49-
uses: actions/cache@v4
49+
uses: actions/cache@v5
5050
with:
5151
path: |
5252
~/.pyenv
@@ -92,7 +92,7 @@ jobs:
9292
source .env/bin/activate
9393
9494
pip install --upgrade pip wheel
95-
constraints_file="constraints-${{ matrix.python-version }}-wsl.txt"
95+
constraints_file="constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt"
9696
regen_constraints=
9797
if [ -f "$constraints_file" ] ; then
9898
at="$(git --no-pager log -p -1 "--format=tformat:%at" --no-patch -- "$constraints_file")"
@@ -118,9 +118,9 @@ jobs:
118118
cd the_repo
119119
source .env/bin/activate
120120
121-
pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}-wsl.txt-relaxed
121+
pip install -r dev-requirements.txt -r mypy-requirements.txt -c constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt-relaxed
122122
# - name: MyPy cache
123-
# uses: actions/cache@v4
123+
# uses: actions/cache@v5
124124
# with:
125125
# path: '.mypy_cache/[0-9]*'
126126
# key: mypy-${{ matrix.python-version }}
@@ -140,18 +140,18 @@ jobs:
140140
source .env/bin/activate
141141
142142
pytest --cov=treecript
143-
- uses: actions/upload-artifact@v4
143+
- uses: actions/upload-artifact@v6
144144
with:
145-
name: wsl_pre-commit-${{ matrix.python-version }}-${{ matrix.distribution }}
145+
name: wsl_pre-commit-${{ matrix.python-version }}_${{ matrix.distribution }}
146146
retention-days: 2
147-
path: the_repo/constraints-${{ matrix.python-version }}-wsl-${{ matrix.distribution }}.txt
147+
path: the_repo/constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt
148148

149149
check_licences:
150150
runs-on: ubuntu-latest
151151
strategy:
152152
matrix:
153153
# python-version: [ "3.12" ]
154-
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
154+
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "3.14" ]
155155
distribution: [ "Ubuntu-22.04", "Ubuntu-24.04" ]
156156
name: Validate licences of gathered dependencies (WSL python ${{ matrix.python-version }} dist ${{ matrix.distribution }})
157157
needs:
@@ -160,17 +160,16 @@ jobs:
160160
- name: Get analysis timestamp
161161
id: timestamp
162162
run: echo "timestamp=$(date -Is)" >> "$GITHUB_OUTPUT"
163-
- uses: actions/download-artifact@v5
163+
- uses: actions/download-artifact@v7
164164
id: download
165165
with:
166-
name: wsl_pre-commit-${{matrix.python-version}}-${{ matrix.distribution }}
166+
name: wsl_pre-commit-${{matrix.python-version}}_${{ matrix.distribution }}
167167
- name: Get transitive dependencies licences
168168
id: license_check_print_report
169-
# uses: pilosus/action-pip-license-checker@v1.0.0
170169
# continue-on-error: true
171170
uses: pilosus/action-pip-license-checker@v3.1.0
172171
with:
173-
requirements: constraints-${{ matrix.python-version }}-wsl-${{ matrix.distribution }}.txt
172+
requirements: constraints-${{ matrix.python-version }}_${{ matrix.distribution }}-wsl.txt
174173
# - name: Check transitive dependencies licences
175174
# id: license_check_report
176175
# uses: pilosus/action-pip-license-checker@v3.1.0
@@ -193,21 +192,21 @@ jobs:
193192
- name: Get analysis timestamp
194193
id: timestamp
195194
run: echo "timestamp=$(date -Is)" >> "$GITHUB_OUTPUT"
196-
- uses: actions/checkout@v5
197-
- uses: actions/download-artifact@v5
195+
- uses: actions/checkout@v6
196+
- uses: actions/download-artifact@v7
198197
id: download
199198
with:
200-
pattern: wsl_pre-commit-*
199+
pattern: wsl_pre-commit-*_*
201200
merge-multiple: true
202201
path: changes-dir
203202
- name: Move artifacts to their right place
204203
id: move
205204
run: |
206205
skip=true
207206
if [ -d "${{steps.download.outputs.download-path}}" ] ; then
208-
for con in "${{steps.download.outputs.download-path}}"/constraints-*-wsl-*.txt ; do
207+
for con in "${{steps.download.outputs.download-path}}"/constraints-*_*-wsl.txt ; do
209208
case "$con" in
210-
*/constraints-\*-wsl-\*.txt)
209+
*/constraints-\*_\*-wsl.txt)
211210
break
212211
;;
213212
*)
@@ -220,12 +219,12 @@ jobs:
220219
echo "skip=$skip" >> "$GITHUB_OUTPUT"
221220
- name: Create Pull Request
222221
id: cpr
223-
uses: peter-evans/create-pull-request@v7
222+
uses: peter-evans/create-pull-request@v8
224223
if: steps.move.outputs.skip == 'false'
225224
with:
226225
title: Updated WSL constraints (triggered on ${{ steps.timestamp.outputs.timestamp }} by ${{ github.sha }})
227226
branch: create-pull-request/patch-wsl_constraints
228-
add-paths: constraints-*-wsl-*.txt
227+
add-paths: constraints-*_*-wsl.txt
229228
delete-branch: true
230229
commit-message: "[create-pull-request] Automatically commit updated contents (constraints WSL)"
231230
- name: Check outputs

0 commit comments

Comments
 (0)