Skip to content

Commit 6680d64

Browse files
acarriedevacarriedev
committed
MESH-2530 Update dependencies
1 parent 5080662 commit 6680d64

12 files changed

Lines changed: 540 additions & 1120 deletions

‎.github/dependabot.yml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
2+
73
updates:
84
- package-ecosystem: "pip"
9-
directory: "/" # Location of package manifests
5+
directory: "/"
6+
commit-message:
7+
prefix: "MESH-2092 "
8+
schedule:
9+
interval: "monthly"
10+
groups:
11+
dependencies:
12+
patterns:
13+
- "*"
14+
15+
- package-ecosystem: "github-actions"
16+
directory: "/"
17+
commit-message:
18+
prefix: "MESH-2092 "
1019
schedule:
11-
interval: "monthly"
20+
interval: "monthly"
21+
groups:
22+
dependencies:
23+
patterns:
24+
- "*"

‎.github/workflows/merge-develop.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
if: github.repository == 'NHSDigital/mesh-sandbox' && !contains(github.event.head_commit.message, 'tag release version:')
1212
steps:
1313
- name: checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
1717

1818
- name: setup python
19-
uses: actions/setup-python@v3
19+
uses: actions/setup-python@v5
2020
with:
21-
python-version: "3.9"
21+
python-version-file: 'pyproject.toml'
2222

2323
- name: setup poetry
24-
uses: abatilo/actions-poetry@v2
24+
uses: abatilo/actions-poetry@v4
2525
with:
2626
poetry-version: 1.5.1
2727

@@ -30,7 +30,7 @@ jobs:
3030
poetry self add "poetry-dynamic-versioning[plugin]"
3131
3232
- name: cache virtualenv
33-
uses: actions/cache@v3
33+
uses: actions/cache@v4
3434
with:
3535
path: |
3636
.venv
@@ -49,7 +49,7 @@ jobs:
4949
5050
- name: setup java
5151
if: success() || failure()
52-
uses: actions/setup-java@v3
52+
uses: actions/setup-java@v5
5353
with:
5454
distribution: "corretto"
5555
java-version: "11"
@@ -70,7 +70,7 @@ jobs:
7070

7171
- name: setup java
7272
if: github.actor != 'dependabot[bot]' && (success() || failure())
73-
uses: actions/setup-java@v3
73+
uses: actions/setup-java@v5
7474
with:
7575
distribution: "corretto"
7676
java-version: "17"
@@ -95,7 +95,7 @@ jobs:
9595

9696
- name: publish junit reports
9797
if: success() || failure()
98-
uses: mikepenz/action-junit-report@v2
98+
uses: mikepenz/action-junit-report@v5
9999
with:
100100
check_name: junit reports
101101
report_paths: reports/junit/*.xml
@@ -110,7 +110,7 @@ jobs:
110110
if: github.repository == 'NHSDigital/mesh-sandbox' && github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
111111
steps:
112112
- name: checkout
113-
uses: actions/checkout@v3
113+
uses: actions/checkout@v5
114114
with:
115115
fetch-depth: 0
116116

@@ -120,12 +120,12 @@ jobs:
120120
find . -type f | xargs chmod g+w
121121
122122
- name: setup python
123-
uses: actions/setup-python@v3
123+
uses: actions/setup-python@v5
124124
with:
125-
python-version: "3.9"
125+
python-version-file: 'pyproject.toml'
126126

127127
- name: setup poetry
128-
uses: abatilo/actions-poetry@v2
128+
uses: abatilo/actions-poetry@v4
129129
with:
130130
poetry-version: 1.5.1
131131

‎.github/workflows/pull-request.yml‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ on:
44
branches:
55
- develop
66

7+
permissions:
8+
pull-requests: write
9+
710
jobs:
811

912
coverage:
1013
runs-on: ubuntu-latest
1114
if: github.repository == 'NHSDigital/mesh-sandbox'
1215
steps:
1316
- name: checkout
14-
uses: actions/checkout@v3
17+
uses: actions/checkout@v5
1518
with:
1619
fetch-depth: 0
1720

@@ -40,12 +43,12 @@ jobs:
4043
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
4144
4245
- name: setup python
43-
uses: actions/setup-python@v3
46+
uses: actions/setup-python@v5
4447
with:
45-
python-version: "3.9"
48+
python-version-file: 'pyproject.toml'
4649

4750
- name: setup poetry
48-
uses: abatilo/actions-poetry@v2
51+
uses: abatilo/actions-poetry@v4
4952
with:
5053
poetry-version: 1.5.1
5154

@@ -54,7 +57,7 @@ jobs:
5457
poetry self add "poetry-dynamic-versioning[plugin]"
5558
5659
- name: cache virtualenv
57-
uses: actions/cache@v3
60+
uses: actions/cache@v4
5861
with:
5962
path: |
6063
.venv
@@ -76,7 +79,7 @@ jobs:
7679
7780
- name: setup java
7881
if: success() || failure()
79-
uses: actions/setup-java@v3
82+
uses: actions/setup-java@v5
8083
with:
8184
distribution: "corretto"
8285
java-version: "11"
@@ -97,7 +100,7 @@ jobs:
97100

98101
- name: setup java
99102
if: github.actor != 'dependabot[bot]' && (success() || failure())
100-
uses: actions/setup-java@v3
103+
uses: actions/setup-java@v5
101104
with:
102105
distribution: "corretto"
103106
java-version: "17"
@@ -134,7 +137,7 @@ jobs:
134137

135138
- name: publish junit reports
136139
if: success() || failure()
137-
uses: mikepenz/action-junit-report@v3
140+
uses: mikepenz/action-junit-report@v5
138141
with:
139142
check_name: junit reports
140143
report_paths: reports/junit/*.xml
@@ -148,7 +151,7 @@ jobs:
148151
if: github.repository == 'NHSDigital/mesh-sandbox'
149152
steps:
150153
- name: checkout
151-
uses: actions/checkout@v3
154+
uses: actions/checkout@v5
152155
with:
153156
fetch-depth: 0
154157

@@ -169,12 +172,12 @@ jobs:
169172
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
170173
171174
- name: setup python
172-
uses: actions/setup-python@v3
175+
uses: actions/setup-python@v5
173176
with:
174-
python-version: "3.9"
177+
python-version-file: 'pyproject.toml'
175178

176179
- name: setup poetry
177-
uses: abatilo/actions-poetry@v2
180+
uses: abatilo/actions-poetry@v4
178181
with:
179182
poetry-version: 1.5.1
180183

@@ -183,7 +186,7 @@ jobs:
183186
poetry self add "poetry-dynamic-versioning[plugin]"
184187
185188
- name: cache virtualenv
186-
uses: actions/cache@v3
189+
uses: actions/cache@v4
187190
with:
188191
path: |
189192
.venv
@@ -228,7 +231,7 @@ jobs:
228231
- lint
229232
steps:
230233
- name: checkout
231-
uses: actions/checkout@v3
234+
uses: actions/checkout@v5
232235
with:
233236
fetch-depth: 0
234237

@@ -254,12 +257,12 @@ jobs:
254257
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
255258
256259
- name: setup python
257-
uses: actions/setup-python@v3
260+
uses: actions/setup-python@v5
258261
with:
259-
python-version: "3.9"
262+
python-version-file: 'pyproject.toml'
260263

261264
- name: setup poetry
262-
uses: abatilo/actions-poetry@v2
265+
uses: abatilo/actions-poetry@v4
263266
with:
264267
poetry-version: 1.5.1
265268

@@ -268,7 +271,7 @@ jobs:
268271
poetry self add "poetry-dynamic-versioning[plugin]"
269272
270273
- name: cache virtualenv
271-
uses: actions/cache@v3
274+
uses: actions/cache@v4
272275
with:
273276
path: |
274277
.venv

‎.github/workflows/scheduled-combine-dependabot-prs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- name: combine-prs
2727
id: combine-prs
28-
uses: github/combine-prs@v5.0.0
28+
uses: actions/combine-prs@v5.2.0
2929
with:
3030
ci_required: ${{ inputs.ci_required == 'YES' }}
3131
labels: dependencies

‎.tool-versions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
poetry 1.5.1
2-
python 3.9.13
3-
java corretto-11.0.17.8.1
1+
poetry 2.1.2
2+
python 3.11.11
3+
java corretto-11.0.26.4.1

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.9-slim-bullseye@sha256:cb47448b7dd1bf0895916c1defab259ed795cb0b531487156c5499298dc3dc8b
1+
FROM python:3.11-slim-bullseye@sha256:53ebfd268fe58ccd405688b3305a7dcad5da03f5e3957126a40c9e59d0962ed0
22

33
WORKDIR /app
44

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ docker compose
2222
--------------
2323

2424
```yaml
25-
version: '3.9'
26-
2725

2826
services:
2927

‎docker-compose.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
version: '3.9'
2-
3-
41
services:
52

63
mesh_sandbox:

0 commit comments

Comments
 (0)