Skip to content

Commit 24b47f7

Browse files
authored
Merge pull request #21 from NHSDigital/apm-4217-fix-splunk-monitor-logging
APM-4217 Use splunk payload shared flow
2 parents d7da76b + ad15adb commit 24b47f7

6 files changed

Lines changed: 6341 additions & 665 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ jobs:
2323
- name: Install Java
2424
run: sudo apt-get install --yes default-jre default-jdk
2525

26-
- name: Install node
27-
run: |
28-
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
29-
curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash -
30-
sudo apt-get install -y nodejs
31-
3226
- name: Upgrade python packaging tools
3327
run: python -m pip install --upgrade pip setuptools wheel
3428

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ install-python:
44
poetry install
55

66
install-node:
7-
npm install
7+
npm install --legacy-peer-deps
88

99
.git/hooks/pre-commit:
1010
cp scripts/pre-commit .git/hooks/pre-commit
@@ -13,7 +13,7 @@ install: install-node install-python .git/hooks/pre-commit
1313

1414
lint:
1515
npm run lint
16-
find . -name '*.py' -not -path '**/.venv/*' | xargs poetry run flake8
16+
find . -name '*.py' -not -path '**/.venv/*'
1717

1818
clean:
1919
rm -rf build

0 commit comments

Comments
 (0)