Skip to content

Commit 7aab076

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/node-21.2.0
2 parents c50323b + 96f02c1 commit 7aab076

7 files changed

Lines changed: 121 additions & 99 deletions

File tree

.github/workflows/continous-integration-workflow.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function
1414

1515
- name: Install Python 3.8
16-
uses: actions/setup-python@v1
16+
uses: actions/setup-python@v4
1717
with:
18-
python-version: 3.8
18+
python-version: 3.8
1919

2020
- name: Update apt repositories
2121
run: sudo apt update
@@ -30,13 +30,13 @@ jobs:
3030
run: pip install poetry
3131

3232
- name: Cache poetry packages
33-
uses: actions/cache@v1
33+
uses: actions/cache@v3
3434
with:
3535
path: ~/.cache/pypoetry
3636
key: ${{ runner.os }}-build-cache-poetry-packages-${{ hashFiles('**/poetry.lock') }}
3737

3838
- name: Cache node modules
39-
uses: actions/cache@v1
39+
uses: actions/cache@v3
4040
with:
4141
path: ~/.npm
4242
key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ lint: ruff
3535
publish:
3636
npm run publish 2> /dev/null
3737

38-
serve:
39-
npm run serve
40-
4138
clean:
4239
rm -rf build
4340
rm -rf dist

package-lock.json

Lines changed: 25 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"lint": "node_modules/.bin/openapi-generator-cli validate -i specification/mesh-api.yaml",
77
"test": "npm run --prefix tests test:sandbox",
88
"publish": "./node_modules/.bin/openapi-generator-cli generate -i specification/mesh-api.yaml --generator-key v3.0 -g openapi -o build && rm openapitools.json && mv build/openapi.json build/mesh-api.json",
9-
"serve": "node_modules/.bin/speccy serve build/mesh-api.json",
109
"check-licenses": "node_modules/.bin/license-checker --failOn GPL --failOn LGPL"
1110
},
1211
"author": "NHS Digital",

0 commit comments

Comments
 (0)