Skip to content

Commit

Permalink
Merge branch 'main' into dependabotCombined
Browse files Browse the repository at this point in the history
  • Loading branch information
aidenvaines-bjss committed Oct 14, 2024
2 parents 54d5809 + e0d0354 commit 993ced0
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cicd-2-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
run: echo "secret_exist=${{ secrets.TEAMS_NOTIFICATION_WEBHOOK_URL != '' }}" >> $GITHUB_OUTPUT
- name: "Notify on publishing packages"
if: steps.check.outputs.secret_exist == 'true'
uses: nhs-england-tools/notify-msteams-action@v0.0.4
uses: nhs-england-tools/notify-msteams-action@v1.0.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
teams-webhook-url: ${{ secrets.TEAMS_NOTIFICATION_WEBHOOK_URL }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-combine-dependabot-prs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v5.1.0
uses: github/combine-prs@v5.2.0
with:
ci_required: false
labels: dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-repository-template-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Create Pull Request
if: ${{ !env.ACT }}
uses: peter-evans/[email protected].1
uses: peter-evans/[email protected].5
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Drift from template
Expand Down
46 changes: 23 additions & 23 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"next": "14.2.15",
"nhsuk-frontend": "^8.3.0",
"nhsuk-react-components": "^4.1.0",
"nhsuk-react-components": "^4.1.3",
"react": "^18",
"react-dom": "^18"
},
Expand All @@ -41,7 +41,7 @@
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-html": "^8.1.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jest": "^28.6.0",
"eslint-plugin-jest": "^28.8.3",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-sonarjs": "^1.0.4",
Expand All @@ -57,7 +57,7 @@
"pm2": "^5.4.2",
"prettier": "^3.3.3",
"sass": "^1.77.8",
"ts-jest": "^29.2.3",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5",
"wait-on": "^7.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ click==8.1.7
Flask-WTF==1.2.0
Flask==2.3.3
itsdangerous==2.1.2
Jinja2==3.1.3
Jinja2==3.1.4
MarkupSafe==2.1.3
pip==23.3
setuptools==65.5.1
setuptools==70.0.0
Werkzeug==3.0.3
wheel==0.41.1
WTForms==3.0.1

0 comments on commit 993ced0

Please sign in to comment.