From e3698d8662cc66135cf1bd9713454f8e409b43a8 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 6 Mar 2024 11:21:31 +0800 Subject: [PATCH 1/2] [CI] pin go v1.21.8 version Because setup-go fails to pick it up. Refs: https://github.com/actions/setup-go/issues/462 (cherry picked from commit d7aaefcea9d38ca50a96f34ff42efe954bce4acd) Conflicts: .forgejo/workflows/build-release.yml .forgejo/workflows/cascade-setup-end-to-end.yml .forgejo/workflows/e2e.yml .forgejo/workflows/testing.yml trivial context conflict --- .forgejo/workflows/publish-release.yml | 2 +- .forgejo/workflows/testing.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index 6d244f70a6..adf33d8b16 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -57,7 +57,7 @@ jobs: uses: https://code.forgejo.org/actions/setup-go@v4 if: secrets.ROLE == 'forgejo-experimental' with: - go-version: "1.21" + go-version: "1.21.8" check-latest: true - name: update the _release.experimental DNS record if: secrets.ROLE == 'forgejo-experimental' diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index 3f01109ee7..d305ab85d7 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -16,7 +16,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.21.8" check-latest: true - run: make deps-backend deps-tools - run: make lint-backend @@ -30,7 +30,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.21.8" check-latest: true - run: make deps-backend deps-tools - run: make --always-make checks-backend # ensure the "go-licenses" make target runs @@ -49,7 +49,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.21.8" - run: | git config --add safe.directory '*' adduser --quiet --comment forgejo --disabled-password forgejo @@ -85,7 +85,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.21.8" - name: install dependencies run: | export DEBIAN_FRONTEND=noninteractive @@ -128,7 +128,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.21.8" - name: install dependencies run: | export DEBIAN_FRONTEND=noninteractive @@ -162,7 +162,7 @@ jobs: - uses: https://code.forgejo.org/actions/checkout@v3 - uses: https://code.forgejo.org/actions/setup-go@v4 with: - go-version: "1.21" + go-version: "1.21.8" - name: install dependencies run: | export DEBIAN_FRONTEND=noninteractive From e7448699f65b41fd310ef04eaea81667e7bb2b27 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 5 Mar 2024 20:35:29 -0500 Subject: [PATCH 2/2] bump protobuf module (#29617) (cherry picked from commit 06039bf0b7ec4dffe74ae323b8bbbbedec69d0c8) Conflicts: go.mod go.sum trivial context conflict --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 42f6538c8f..28feb62af2 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,7 @@ require ( golang.org/x/text v0.14.0 golang.org/x/tools v0.17.0 google.golang.org/grpc v1.58.3 - google.golang.org/protobuf v1.31.0 + google.golang.org/protobuf v1.33.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index e8392ba981..859a5e1681 100644 --- a/go.sum +++ b/go.sum @@ -1444,8 +1444,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/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=