Skip to content

Commit 2186ce0

Browse files
Merge branch 'main' into dependabot/pip/aws-lambda-powertools-3.23.0
2 parents dec44fd + 1f9fcb0 commit 2186ce0

File tree

8 files changed

+320
-206
lines changed

8 files changed

+320
-206
lines changed

.github/workflows/cdk_package_code.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
id: asdf-version
3131
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
3232

33-
3433
# using git commit sha for version of action to ensure we have stable version
3534
- name: Install asdf
3635
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
@@ -67,16 +66,18 @@ jobs:
6766
6867
- name: Build Python Lambda Functions
6968
run: |
70-
poetry export --without-hashes --format=requirements.txt --with slackBotFunction > requirements_slackBotFunction
71-
poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > requirements_syncKnowledgeBaseFunction
72-
if [ ! -s requirements_slackBotFunction ]; then \
73-
echo "Error: requirements_slackBotFunction is empty or missing"; \
69+
poetry show --only=slackBotFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_slackBotFunction
70+
poetry show --only=syncKnowledgeBaseFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_syncKnowledgeBaseFunction
71+
if [ ! -s requirements_slackBotFunction ] || [ "$(grep -c -v '^[[:space:]]*$' requirements_slackBotFunction)" -eq 0 ]; then \
72+
echo "Error: requirements_slackBotFunction is empty or contains only blank lines"; \
7473
exit 1; \
7574
fi
76-
if [ ! -s requirements_syncKnowledgeBaseFunction ]; then \
77-
echo "Error: requirements_syncKnowledgeBaseFunction is empty or missing"; \
75+
if [ ! -s requirements_syncKnowledgeBaseFunction ] || [ "$(grep -c -v '^[[:space:]]*$' requirements_syncKnowledgeBaseFunction)" -eq 0 ]; then \
76+
echo "Error: requirements_syncKnowledgeBaseFunction is empty or contains only blank lines"; \
7877
exit 1; \
7978
fi
79+
mkdir -p .dependencies/slackBotFunction/python
80+
mkdir -p .dependencies/syncKnowledgeBaseFunction/python
8081
pip3 install -r requirements_slackBotFunction -t .dependencies/slackBotFunction/python
8182
pip3 install -r requirements_syncKnowledgeBaseFunction -t .dependencies/syncKnowledgeBaseFunction/python
8283

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
tag_release:
3636
needs: [quality_checks, get_asdf_version]
37-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f3d071da30cd01dc0e4472ac0e2d7452db78d1c7
37+
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
3838
with:
3939
dry_run: true
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
tag_release:
4040
needs: [quality_checks, get_asdf_version]
41-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f3d071da30cd01dc0e4472ac0e2d7452db78d1c7
41+
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
4242
with:
4343
dry_run: false
4444
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

package-lock.json

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
"devDependencies": {
2020
"@semantic-release/changelog": "^6.0.3",
2121
"@semantic-release/release-notes-generator": "^14.1.0",
22-
"@types/aws-lambda": "^8.10.157",
22+
"@types/aws-lambda": "^8.10.158",
2323
"@types/jest": "^30.0.0",
24-
"@types/node": "^24.10.0",
25-
"@typescript-eslint/eslint-plugin": "^8.46.3",
24+
"@types/node": "^24.10.1",
25+
"@typescript-eslint/eslint-plugin": "^8.46.4",
2626
"@typescript-eslint/parser": "^8.46.2",
2727
"eslint": "^9.39.1",
2828
"eslint-plugin-import-newlines": "^1.4.0",
2929
"jest": "^30.2.0",
3030
"jest-junit": "^16.0.0",
3131
"license-checker": "^25.0.1",
32-
"semantic-release": "^25.0.1",
32+
"semantic-release": "^25.0.2",
3333
"ts-jest": "^29.4.5",
3434
"ts-node": "^10.9.2",
3535
"typescript": "^5.9.3"
3636
},
3737
"dependencies": {
3838
"conventional-changelog-eslint": "^6.0.0",
39-
"esbuild": "^0.25.12"
39+
"esbuild": "^0.27.0"
4040
}
4141
}

packages/cdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"source-map-support": "^0.5.21"
1919
},
2020
"devDependencies": {
21-
"@types/node": "^24.10.0",
21+
"@types/node": "^24.10.1",
2222
"aws-cdk": "^2.1031.2"
2323
}
2424
}

poetry.lock

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

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ click = "^8.3.0"
2626
rich = "^14.1.0"
2727
pytest-mock = "^3.15.1"
2828
pytest-cov = "^7.0.0"
29-
moto = {extras = ["ssm"], version = "^5.1.12"}
29+
moto = {extras = ["ssm"], version = "^5.1.16"}
3030

3131

3232
[tool.poetry.group.slackBotFunction.dependencies]

0 commit comments

Comments
 (0)