aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Lee <ethanalee@google.com>2025-12-30 20:25:35 +0000
committerGopher Robot <gobot@golang.org>2025-12-30 13:59:10 -0800
commit5a4d5c58bc73e708a7a867b717b4757e67e6eec9 (patch)
tree2830333e03d28926f973c70ee3886ae509128253
parent0432e49b609a4bb73d29a3dce9c89978a29f079b (diff)
downloadgo-x-pkgsite-5a4d5c58bc73e708a7a867b717b4757e67e6eec9.tar.xz
deploy: bump Go version to 1.25.5 and update deps
Change-Id: I811776287454ba74b0ec8c1796c20907bf562150 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/733341 Reviewed-by: Nicholas Husin <husin@google.com> kokoro-CI: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicholas Husin <nsh@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: Ethan Lee <ethanalee@google.com>
-rw-r--r--deploy/deploy-env.yaml4
-rw-r--r--deploy/deploy.yaml6
-rw-r--r--deploy/migrate.yaml2
-rw-r--r--deploy/sitemap.yaml2
-rw-r--r--devtools/docker/compose.yaml12
-rw-r--r--go.mod4
-rw-r--r--go.sum4
7 files changed, 17 insertions, 17 deletions
diff --git a/deploy/deploy-env.yaml b/deploy/deploy-env.yaml
index cbcee339..8bc94629 100644
--- a/deploy/deploy-env.yaml
+++ b/deploy/deploy-env.yaml
@@ -22,7 +22,7 @@ steps:
args:
- $PROJECT_ID
- id: Check redistributable
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: private/devtools/check_redist.sh
- id: Build
name: gcr.io/cloud-builders/docker
@@ -50,7 +50,7 @@ steps:
- -c
- deploy/frontend.sh $_ENV gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: deploy/pagecheck.sh
args:
- $_ENV
diff --git a/deploy/deploy.yaml b/deploy/deploy.yaml
index 5a686867..b2bbe955 100644
--- a/deploy/deploy.yaml
+++ b/deploy/deploy.yaml
@@ -22,7 +22,7 @@ steps:
args:
- $PROJECT_ID
- id: Check redistributable
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: private/devtools/check_redist.sh
- id: Build
name: gcr.io/cloud-builders/docker
@@ -50,7 +50,7 @@ steps:
- -c
- deploy/frontend.sh staging gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck - staging
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: deploy/pagecheck.sh
args:
- staging
@@ -81,7 +81,7 @@ steps:
- -c
- deploy/frontend.sh prod gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
- id: Pagecheck - prod
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: deploy/pagecheck.sh
args:
- prod
diff --git a/deploy/migrate.yaml b/deploy/migrate.yaml
index dd5e485c..4f56f037 100644
--- a/deploy/migrate.yaml
+++ b/deploy/migrate.yaml
@@ -18,7 +18,7 @@ steps:
args:
- $PROJECT_ID
- id: Migrate
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: bash
dir: private
args:
diff --git a/deploy/sitemap.yaml b/deploy/sitemap.yaml
index 8201c461..353d5ae6 100644
--- a/deploy/sitemap.yaml
+++ b/deploy/sitemap.yaml
@@ -9,7 +9,7 @@ steps:
args:
- $PROJECT_ID
- id: Build
- name: golang:1.24
+ name: golang:1.25.5
entrypoint: bash
dir: private
args:
diff --git a/devtools/docker/compose.yaml b/devtools/docker/compose.yaml
index a63be143..6bfb8fd7 100644
--- a/devtools/docker/compose.yaml
+++ b/devtools/docker/compose.yaml
@@ -30,7 +30,7 @@ services:
depends_on:
- db
# This should match the version we are using on Cloud Run.
- image: golang:1.24
+ image: golang:1.25.5
environment:
<<: [*database-variables, *go-variables]
GO_DISCOVERY_TESTDB: ${GO_DISCOVERY_TESTDB:-"true"}
@@ -41,7 +41,7 @@ services:
- ../../:/pkgsite
working_dir: /pkgsite
searchtest:
- image: golang:1.24
+ image: golang:1.25.5
depends_on:
- frontend
environment:
@@ -52,7 +52,7 @@ services:
- ../../:/pkgsite
working_dir: /pkgsite
api:
- image: golang:1.24
+ image: golang:1.25.5
depends_on:
- frontend
environment:
@@ -64,7 +64,7 @@ services:
working_dir: /pkgsite
frontend:
# This should match the version we are using on AppEngine.
- image: golang:1.24
+ image: golang:1.25.5
depends_on:
- db
command: bash -c "
@@ -81,7 +81,7 @@ services:
working_dir: /pkgsite
seeddb:
# This should match the version we are using on Cloud Run.
- image: golang:1.24
+ image: golang:1.25.5
depends_on:
- db
# Note: technically we should check that migrations have completed before
@@ -134,7 +134,7 @@ services:
shm_size: 8G
go:
# This should match the version we are using on Cloud Run.
- image: golang:1.24
+ image: golang:1.25.5
entrypoint: go
environment:
<<: [*database-variables, *go-variables]
diff --git a/go.mod b/go.mod
index 24d21554..f3a35843 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module golang.org/x/pkgsite
-go 1.24.1
+go 1.25.5
require (
cloud.google.com/go/cloudtasks v1.10.0
@@ -36,7 +36,7 @@ require (
google.golang.org/api v0.126.0
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc
google.golang.org/grpc v1.57.0
- google.golang.org/protobuf v1.31.0
+ google.golang.org/protobuf v1.33.0
gopkg.in/yaml.v3 v3.0.1
rsc.io/markdown v0.0.0-20231214224604-88bb533a6020
)
diff --git a/go.sum b/go.sum
index 79486899..6f2fd9db 100644
--- a/go.sum
+++ b/go.sum
@@ -1638,8 +1638,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=