Skip to content
Snippets Groups Projects
Commit 0872fe99 authored by Ole Langbehn's avatar Ole Langbehn
Browse files

Merge branch 'main' into production

parents 583349a6 5761c052
No related branches found
Tags release/1.46.0
No related merge requests found
......@@ -79,10 +79,10 @@ lint:
- release/*
build_docker:
image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27'
image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:28'
stage: 'build'
services:
- name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:27-dind'
- name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/docker:28-dind'
alias: 'docker'
variables:
# this could be fetched via terraform output ("gcr_location" in infra project), but then we would need an extra job for terraform
......@@ -153,7 +153,7 @@ review_smoketest:
review_destroy:
stage: destroy
image:
name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.9.8'
name: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/hashicorp/terraform:1.11.0'
# default entrypoint is terraform command, but we want to run shell scripts
entrypoint: ['/bin/sh', '-c']
variables:
......
1.9.8
1.11.0
......@@ -7,7 +7,7 @@
# Afterwards, some packages might need a downgrade or version tweak for the bundle fitting together and fitting the code
adrf==0.1.9
aiofiles==24.1.0
aiohappyeyeballs==2.4.6
aiohappyeyeballs==2.4.8
aiohttp==3.11.13
aiosignal==1.3.2
ASGIMiddlewareStaticFile==0.6.1
......@@ -53,9 +53,9 @@ google-api-core==2.24.1
google-auth==2.38.0
google-cloud-pubsub==2.28.0
google-cloud-webrisk==1.17.0
googleapis-common-protos==1.68.0
googleapis-common-protos==1.69.0
graphql-core==3.2.6
grpc-google-iam-v1==0.14.0
grpc-google-iam-v1==0.14.1
grpcio==1.70.0
grpcio-status==1.70.0
h11==0.14.0
......@@ -83,7 +83,7 @@ pilkit==3.0
pillow==11.1.0
platformdirs==4.3.6
pluggy==1.5.0
posthog==3.15.1
posthog==3.18.1
propcache==0.3.0
proto-plus==1.26.0
protobuf==5.29.3
......@@ -93,7 +93,7 @@ pyasn1==0.6.1
pyasn1_modules==0.4.1
pycparser==2.22
PyJWT==2.10.1
pytest==8.3.4
pytest==8.3.5
pytest-asyncio==0.25.3
pytest-cov==6.0.0
pytest-django==4.10.0
......@@ -115,7 +115,7 @@ rq==2.1.0
rsa==4.9
ruamel.yaml==0.18.10
ruamel.yaml.clib==0.2.12
ruff==0.9.7
ruff==0.9.9
sentry-sdk==2.22.0
six==1.17.0
soupsieve==2.6
......
......@@ -4,11 +4,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "6.22.0"
version = "6.24.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "6.21.0"
version = "6.24.0"
}
}
backend "gcs" {
......
......@@ -4,11 +4,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "6.22.0"
version = "6.24.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "6.21.0"
version = "6.24.0"
}
}
backend "gcs" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment