Skip to content

Commit f1b37c9

Browse files
acarriedevacarriedev
authored
Merge pull request #185 from NHSDigital/mesh-2530-update-dependencies
MESH-2530 Update dependencies
2 parents 5080662 + 1297a60 commit f1b37c9

12 files changed

Lines changed: 594 additions & 1069 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: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,28 @@ on:
44
branches:
55
- develop
66

7-
jobs:
7+
permissions:
8+
contents: write
9+
checks: write
10+
pull-requests: write
811

12+
jobs:
913
coverage:
1014
runs-on: ubuntu-latest
1115
if: github.repository == 'NHSDigital/mesh-sandbox' && !contains(github.event.head_commit.message, 'tag release version:')
1216
steps:
1317
- name: checkout
14-
uses: actions/checkout@v3
18+
uses: actions/checkout@v5
1519
with:
1620
fetch-depth: 0
1721

1822
- name: setup python
19-
uses: actions/setup-python@v3
23+
uses: actions/setup-python@v5
2024
with:
21-
python-version: "3.9"
25+
python-version-file: "pyproject.toml"
2226

2327
- name: setup poetry
24-
uses: abatilo/actions-poetry@v2
28+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
2529
with:
2630
poetry-version: 1.5.1
2731

@@ -30,7 +34,7 @@ jobs:
3034
poetry self add "poetry-dynamic-versioning[plugin]"
3135
3236
- name: cache virtualenv
33-
uses: actions/cache@v3
37+
uses: actions/cache@v4
3438
with:
3539
path: |
3640
.venv
@@ -49,7 +53,7 @@ jobs:
4953
5054
- name: setup java
5155
if: success() || failure()
52-
uses: actions/setup-java@v3
56+
uses: actions/setup-java@v5
5357
with:
5458
distribution: "corretto"
5559
java-version: "11"
@@ -70,7 +74,7 @@ jobs:
7074

7175
- name: setup java
7276
if: github.actor != 'dependabot[bot]' && (success() || failure())
73-
uses: actions/setup-java@v3
77+
uses: actions/setup-java@v5
7478
with:
7579
distribution: "corretto"
7680
java-version: "17"
@@ -95,7 +99,7 @@ jobs:
9599

96100
- name: publish junit reports
97101
if: success() || failure()
98-
uses: mikepenz/action-junit-report@v2
102+
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3
99103
with:
100104
check_name: junit reports
101105
report_paths: reports/junit/*.xml
@@ -104,13 +108,12 @@ jobs:
104108
if: success() || failure()
105109
run: make down
106110

107-
108111
publish:
109112
runs-on: ubuntu-latest
110113
if: github.repository == 'NHSDigital/mesh-sandbox' && github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
111114
steps:
112115
- name: checkout
113-
uses: actions/checkout@v3
116+
uses: actions/checkout@v5
114117
with:
115118
fetch-depth: 0
116119

@@ -120,12 +123,12 @@ jobs:
120123
find . -type f | xargs chmod g+w
121124
122125
- name: setup python
123-
uses: actions/setup-python@v3
126+
uses: actions/setup-python@v5
124127
with:
125-
python-version: "3.9"
128+
python-version-file: "pyproject.toml"
126129

127130
- name: setup poetry
128-
uses: abatilo/actions-poetry@v2
131+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
129132
with:
130133
poetry-version: 1.5.1
131134

@@ -151,8 +154,10 @@ jobs:
151154
release_name: ${{ env.RELEASE_VERSION }}
152155

153156
- name: poetry config
157+
env:
158+
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
154159
run: |
155-
poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
160+
poetry config pypi-token.pypi "$POETRY_PYPI_TOKEN_PYPI"
156161
157162
- name: poetry publish
158163
run: poetry publish

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

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

7-
jobs:
7+
permissions:
8+
contents: write
9+
checks: write
10+
pull-requests: write
811

12+
jobs:
913
coverage:
1014
runs-on: ubuntu-latest
1115
if: github.repository == 'NHSDigital/mesh-sandbox'
1216
steps:
1317
- name: checkout
14-
uses: actions/checkout@v3
18+
uses: actions/checkout@v5
1519
with:
1620
fetch-depth: 0
1721

@@ -33,19 +37,22 @@ jobs:
3337
- name: merge into base_branch
3438
if: ${{ github.event_name == 'pull_request' }}
3539
run: |
36-
echo base branch "${{ github.base_ref }}"
37-
echo pr branch "${{ github.head_ref }}"
38-
git checkout "${{ github.base_ref }}"
40+
echo base branch "$BASE_BRANCH"
41+
echo pr branch "$PR_BRANCH"
42+
git checkout "$BASE_BRANCH"
3943
git checkout -b "merging-${{ github.event.number }}"
4044
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
45+
env:
46+
BASE_BRANCH: ${{ github.base_ref }}
47+
PR_BRANCH: ${{ github.head_ref }}
4148

4249
- name: setup python
43-
uses: actions/setup-python@v3
50+
uses: actions/setup-python@v5
4451
with:
45-
python-version: "3.9"
52+
python-version-file: "pyproject.toml"
4653

4754
- name: setup poetry
48-
uses: abatilo/actions-poetry@v2
55+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
4956
with:
5057
poetry-version: 1.5.1
5158

@@ -54,7 +61,7 @@ jobs:
5461
poetry self add "poetry-dynamic-versioning[plugin]"
5562
5663
- name: cache virtualenv
57-
uses: actions/cache@v3
64+
uses: actions/cache@v4
5865
with:
5966
path: |
6067
.venv
@@ -76,7 +83,7 @@ jobs:
7683
7784
- name: setup java
7885
if: success() || failure()
79-
uses: actions/setup-java@v3
86+
uses: actions/setup-java@v5
8087
with:
8188
distribution: "corretto"
8289
java-version: "11"
@@ -97,7 +104,7 @@ jobs:
97104

98105
- name: setup java
99106
if: github.actor != 'dependabot[bot]' && (success() || failure())
100-
uses: actions/setup-java@v3
107+
uses: actions/setup-java@v5
101108
with:
102109
distribution: "corretto"
103110
java-version: "17"
@@ -134,7 +141,7 @@ jobs:
134141

135142
- name: publish junit reports
136143
if: success() || failure()
137-
uses: mikepenz/action-junit-report@v3
144+
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3
138145
with:
139146
check_name: junit reports
140147
report_paths: reports/junit/*.xml
@@ -148,7 +155,7 @@ jobs:
148155
if: github.repository == 'NHSDigital/mesh-sandbox'
149156
steps:
150157
- name: checkout
151-
uses: actions/checkout@v3
158+
uses: actions/checkout@v5
152159
with:
153160
fetch-depth: 0
154161

@@ -162,19 +169,22 @@ jobs:
162169
- name: merge into base_branch
163170
if: ${{ github.event_name == 'pull_request' }}
164171
run: |
165-
echo base branch "${{ github.base_ref }}"
166-
echo pr branch "${{ github.head_ref }}"
167-
git checkout "${{ github.base_ref }}"
172+
echo base branch "$BASE_BRANCH"
173+
echo pr branch "$PR_BRANCH"
174+
git checkout "$BASE_BRANCH"
168175
git checkout -b "merging-${{ github.event.number }}"
169176
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
177+
env:
178+
BASE_BRANCH: ${{ github.base_ref }}
179+
PR_BRANCH: ${{ github.head_ref }}
170180

171181
- name: setup python
172-
uses: actions/setup-python@v3
182+
uses: actions/setup-python@v5
173183
with:
174-
python-version: "3.9"
184+
python-version-file: "pyproject.toml"
175185

176186
- name: setup poetry
177-
uses: abatilo/actions-poetry@v2
187+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
178188
with:
179189
poetry-version: 1.5.1
180190

@@ -183,7 +193,7 @@ jobs:
183193
poetry self add "poetry-dynamic-versioning[plugin]"
184194
185195
- name: cache virtualenv
186-
uses: actions/cache@v3
196+
uses: actions/cache@v4
187197
with:
188198
path: |
189199
.venv
@@ -205,21 +215,20 @@ jobs:
205215
run: make mypy
206216

207217
- name: hadolint
208-
uses: hadolint/hadolint-action@master
218+
uses: hadolint/hadolint-action@5d0317e9d0d2c15b383fbc7433e9d0aed07ec660
209219
with:
210220
dockerfile: "Dockerfile"
211221
recursive: true
212222
config: ./hadolint.yml
213223

214224
- name: shellcheck
215-
uses: ludeeus/action-shellcheck@master
225+
uses: ludeeus/action-shellcheck@00b27aa7cb85167568cb48a3838b75f4265f2bca
216226
with:
217227
ignore_paths: .venv build
218228
ignore_names: git-secrets
219229
env:
220230
SHELLCHECK_OPTS: -f gcc -e SC1090,SC1091
221231

222-
223232
publish:
224233
runs-on: ubuntu-latest
225234
if: github.repository == 'NHSDigital/mesh-sandbox' && github.actor != 'dependabot[bot]'
@@ -228,7 +237,7 @@ jobs:
228237
- lint
229238
steps:
230239
- name: checkout
231-
uses: actions/checkout@v3
240+
uses: actions/checkout@v5
232241
with:
233242
fetch-depth: 0
234243

@@ -247,19 +256,22 @@ jobs:
247256
- name: merge into base_branch
248257
if: ${{ github.event_name == 'pull_request' }}
249258
run: |
250-
echo base branch "${{ github.base_ref }}"
251-
echo pr branch "${{ github.head_ref }}"
252-
git checkout "${{ github.base_ref }}"
259+
echo base branch "$BASE_BRANCH"
260+
echo pr branch "$PR_BRANCH"
261+
git checkout "$BASE_BRANCH"
253262
git checkout -b "merging-${{ github.event.number }}"
254263
git merge --ff-only "${{ github.event.pull_request.head.sha }}"
264+
env:
265+
BASE_BRANCH: ${{ github.base_ref }}
266+
PR_BRANCH: ${{ github.head_ref }}
255267

256268
- name: setup python
257-
uses: actions/setup-python@v3
269+
uses: actions/setup-python@v5
258270
with:
259-
python-version: "3.9"
271+
python-version-file: "pyproject.toml"
260272

261273
- name: setup poetry
262-
uses: abatilo/actions-poetry@v2
274+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
263275
with:
264276
poetry-version: 1.5.1
265277

@@ -268,7 +280,7 @@ jobs:
268280
poetry self add "poetry-dynamic-versioning[plugin]"
269281
270282
- name: cache virtualenv
271-
uses: actions/cache@v3
283+
uses: actions/cache@v4
272284
with:
273285
path: |
274286
.venv
@@ -285,10 +297,11 @@ jobs:
285297
poetry build --format=wheel
286298
287299
- name: poetry config
300+
env:
301+
POETRY_PYPI_TOKEN_TESTPYPI: ${{ secrets.TEST_PYPI_TOKEN }}
288302
run: |
289303
poetry config repositories.testpypi https://test.pypi.org/legacy/
290-
poetry config pypi-token.testpypi ${{ secrets.TEST_PYPI_TOKEN }}
304+
poetry config pypi-token.testpypi "$POETRY_PYPI_TOKEN_TESTPYPI"
291305
292306
- name: poetry test publish
293307
run: poetry publish -r testpypi
294-

‎.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

0 commit comments

Comments
 (0)