Skip to content

Commit be35b83

Browse files
committed
MESH-2530 Use commits on actions
1 parent 6680d64 commit be35b83

2 files changed

Lines changed: 19 additions & 20 deletions

File tree

.github/workflows/merge-develop.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
- develop
66

77
jobs:
8-
98
coverage:
109
runs-on: ubuntu-latest
1110
if: github.repository == 'NHSDigital/mesh-sandbox' && !contains(github.event.head_commit.message, 'tag release version:')
@@ -18,10 +17,10 @@ jobs:
1817
- name: setup python
1918
uses: actions/setup-python@v5
2019
with:
21-
python-version-file: 'pyproject.toml'
20+
python-version-file: "pyproject.toml"
2221

2322
- name: setup poetry
24-
uses: abatilo/actions-poetry@v4
23+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
2524
with:
2625
poetry-version: 1.5.1
2726

@@ -95,7 +94,7 @@ jobs:
9594

9695
- name: publish junit reports
9796
if: success() || failure()
98-
uses: mikepenz/action-junit-report@v5
97+
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3
9998
with:
10099
check_name: junit reports
101100
report_paths: reports/junit/*.xml
@@ -104,7 +103,6 @@ jobs:
104103
if: success() || failure()
105104
run: make down
106105

107-
108106
publish:
109107
runs-on: ubuntu-latest
110108
if: github.repository == 'NHSDigital/mesh-sandbox' && github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, 'tag release version:')
@@ -122,7 +120,7 @@ jobs:
122120
- name: setup python
123121
uses: actions/setup-python@v5
124122
with:
125-
python-version-file: 'pyproject.toml'
123+
python-version-file: "pyproject.toml"
126124

127125
- name: setup poetry
128126
uses: abatilo/actions-poetry@v4
@@ -151,8 +149,10 @@ jobs:
151149
release_name: ${{ env.RELEASE_VERSION }}
152150

153151
- name: poetry config
152+
env:
153+
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
154154
run: |
155-
poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
155+
poetry config pypi-token.pypi "$POETRY_PYPI_TOKEN_PYPI"
156156
157157
- name: poetry publish
158158
run: poetry publish

.github/workflows/pull-request.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ permissions:
88
pull-requests: write
99

1010
jobs:
11-
1211
coverage:
1312
runs-on: ubuntu-latest
1413
if: github.repository == 'NHSDigital/mesh-sandbox'
@@ -45,10 +44,10 @@ jobs:
4544
- name: setup python
4645
uses: actions/setup-python@v5
4746
with:
48-
python-version-file: 'pyproject.toml'
47+
python-version-file: "pyproject.toml"
4948

5049
- name: setup poetry
51-
uses: abatilo/actions-poetry@v4
50+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
5251
with:
5352
poetry-version: 1.5.1
5453

@@ -137,7 +136,7 @@ jobs:
137136

138137
- name: publish junit reports
139138
if: success() || failure()
140-
uses: mikepenz/action-junit-report@v5
139+
uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3
141140
with:
142141
check_name: junit reports
143142
report_paths: reports/junit/*.xml
@@ -174,10 +173,10 @@ jobs:
174173
- name: setup python
175174
uses: actions/setup-python@v5
176175
with:
177-
python-version-file: 'pyproject.toml'
176+
python-version-file: "pyproject.toml"
178177

179178
- name: setup poetry
180-
uses: abatilo/actions-poetry@v4
179+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
181180
with:
182181
poetry-version: 1.5.1
183182

@@ -208,21 +207,20 @@ jobs:
208207
run: make mypy
209208

210209
- name: hadolint
211-
uses: hadolint/hadolint-action@master
210+
uses: hadolint/hadolint-action@5d0317e9d0d2c15b383fbc7433e9d0aed07ec660
212211
with:
213212
dockerfile: "Dockerfile"
214213
recursive: true
215214
config: ./hadolint.yml
216215

217216
- name: shellcheck
218-
uses: ludeeus/action-shellcheck@master
217+
uses: ludeeus/action-shellcheck@00b27aa7cb85167568cb48a3838b75f4265f2bca
219218
with:
220219
ignore_paths: .venv build
221220
ignore_names: git-secrets
222221
env:
223222
SHELLCHECK_OPTS: -f gcc -e SC1090,SC1091
224223

225-
226224
publish:
227225
runs-on: ubuntu-latest
228226
if: github.repository == 'NHSDigital/mesh-sandbox' && github.actor != 'dependabot[bot]'
@@ -259,10 +257,10 @@ jobs:
259257
- name: setup python
260258
uses: actions/setup-python@v5
261259
with:
262-
python-version-file: 'pyproject.toml'
260+
python-version-file: "pyproject.toml"
263261

264262
- name: setup poetry
265-
uses: abatilo/actions-poetry@v4
263+
uses: abatilo/actions-poetry@0dd19c9498c3dc8728967849d0d2eae428a8a3d8
266264
with:
267265
poetry-version: 1.5.1
268266

@@ -288,10 +286,11 @@ jobs:
288286
poetry build --format=wheel
289287
290288
- name: poetry config
289+
env:
290+
POETRY_PYPI_TOKEN_TESTPYPI: ${{ secrets.TEST_PYPI_TOKEN }}
291291
run: |
292292
poetry config repositories.testpypi https://test.pypi.org/legacy/
293-
poetry config pypi-token.testpypi ${{ secrets.TEST_PYPI_TOKEN }}
293+
poetry config pypi-token.testpypi "$POETRY_PYPI_TOKEN_TESTPYPI"
294294
295295
- name: poetry test publish
296296
run: poetry publish -r testpypi
297-

0 commit comments

Comments
 (0)