Skip to content

Commit

Permalink
Merge pull request #301 from ministryofjustice/renovate-all-minor-pat…
Browse files Browse the repository at this point in the history
…ch-updates

Renovate Update Patch & Minor Updates
  • Loading branch information
jamesrwarren authored Oct 23, 2024
2 parents 4d5565d + f00907e commit 33cb913
Show file tree
Hide file tree
Showing 9 changed files with 1,008 additions and 1,156 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

- id: terraform_version
name: get terraform version
uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.0.8
uses: ministryofjustice/opg-github-actions/.github/actions/terraform-version@v3.1.0
with:
terraform_directory: terraform

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_path_to_live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
url: https://incident.opg.service.justice.gov.uk/ht/

end_of_pr_workflow:
name: End of PR Workflow
name: end of workflow
runs-on: ubuntu-latest
needs: [workflow_variables,smoke_test]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_pull_request_path.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
url: https://dev.incident.opg.service.justice.gov.uk/ht/

end_of_pr_workflow:
name: End of PR Workflow
name: end of workflow
runs-on: ubuntu-latest
needs: [workflow_variables,smoke_test]
steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.response
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.12-slim
FROM python:3.13-slim

RUN apt-get update && apt-get install -y --no-install-recommends \
curl \
Expand Down
6 changes: 3 additions & 3 deletions nginx/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"watch": "webpack --watch"
},
"dependencies": {
"@ministryofjustice/frontend": "^0.0.21",
"@ministryofjustice/frontend": "^0.2.0",
"govuk-frontend": "^3.9.0"
},
"devDependencies": {
"@babel/core": "7.21.3",
"@babel/core": "7.25.8",
"@babel/preset-env": "^7.11.5",
"babel-loader": "^8.1.0",
"copy-webpack-plugin": "^6.1.1",
"css-loader": "5.2",
"mini-css-extract-plugin": "2.5.1",
"mini-css-extract-plugin": "2.9.1",
"sass": "^1.26.11",
"sass-loader": "^10.0.2",
"webpack": "^5.94.0",
Expand Down
2,097 changes: 968 additions & 1,129 deletions nginx/webpack/yarn.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Django==4.2.16
django-after-response==0.2.2
git+https://github.com/ministryofjustice/opg-response.git@9d8dc7673aed3790d49a7917576240b5ee4b23a2#egg=django-incident-response
django-health-check==3.18.3
django-decorator-include==3.0
django-decorator-include==3.1
pytest-mock==3.14.0
pytest-django==4.9.0
python-dotenv==1.0.1
gunicorn==22.0.0
psycopg2-binary==2.9.9
psycopg2-binary==2.9.10
social-auth-app-django==5.4.2
pypd==1.1.0
45 changes: 29 additions & 16 deletions terraform/.terraform.lock.hcl

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

4 changes: 2 additions & 2 deletions terraform/versions.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
terraform {
required_version = "1.9.7"
required_version = "1.9.8"
required_providers {
aws = {
source = "hashicorp/aws"
version = "5.46.0"
version = "5.72.1"
}
}

Expand Down

0 comments on commit 33cb913

Please sign in to comment.