Skip to content

Commit ab718dd

Browse files
authored
PMM-7 downgrade go to v1.21 (#2864)
1 parent 419265f commit ab718dd

File tree

10 files changed

+12
-16
lines changed

10 files changed

+12
-16
lines changed

.github/workflows/clean.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
go:
16-
- version: 1.22.x
16+
- version: 1.21.x
1717
may-fail: false
1818
- version: tip
1919
may-fail: true

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Dockerfile is used only for API tests.
22

3-
FROM golang:1.22
3+
FROM golang:1.21
44

55
RUN export GOPATH=$(go env GOPATH) && \
66
mkdir -p $GOPATH/src/github.com/percona/pmm

build/docker/rpmbuild/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN yum update -y && \
2323
yum clean all && rm -rf /var/cache/yum
2424

2525
# keep that format for easier search
26-
ENV GO_VERSION 1.22.0
26+
ENV GO_VERSION 1.21.7
2727
ENV GO_RELEASER_VERSION 1.24.0
2828

2929
RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \

build/docker/rpmbuild/Dockerfile.el9

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN yum update -y && \
2525
yum clean all && rm -rf /var/cache/yum
2626

2727
# keep that format for easier search
28-
ENV GO_VERSION 1.22.0
28+
ENV GO_VERSION 1.21.7
2929
ENV GO_RELEASER_VERSION 1.24.0
3030

3131
RUN if [ `uname -i` == "x86_64" ]; then ARCH=amd64; else ARCH=arm64; fi && \

devcontainer.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG PMM_SERVER_IMAGE="perconalab/pmm-server:dev-latest"
22
FROM $PMM_SERVER_IMAGE
33

44
ARG PMM_SERVER_IMAGE
5-
ARG GO_VERSION="1.22.x"
5+
ARG GO_VERSION="1.21.x"
66

77
RUN echo "Building with: GO: $GO_VERSION, PMM: $PMM_SERVER_IMAGE"
88
ENV GOPATH=/root/go

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/percona/pmm
22

3-
go 1.22
4-
5-
toolchain go1.22.0
3+
go 1.21
64

75
// Update saas with
86
// go get -v github.com/percona-platform/saas@latest

tools/go.mod

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/percona/pmm/tools
22

3-
go 1.22
4-
5-
toolchain go1.22.0
3+
go 1.21
64

75
replace github.com/go-openapi/spec => github.com/Percona-Lab/spec v0.20.5-percona
86

@@ -22,7 +20,7 @@ require (
2220
github.com/quasilyte/go-consistent v0.6.0
2321
github.com/reviewdog/reviewdog v0.17.0
2422
github.com/vburenin/ifacemaker v1.2.1
25-
github.com/vektra/mockery/v2 v2.42.0
23+
github.com/vektra/mockery/v2 v2.40.2
2624
golang.org/x/perf v0.0.0-20230717203022-1ba3a21238c9
2725
golang.org/x/tools v0.18.0
2826
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0

tools/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@ github.com/vbatts/tar-split v0.11.5 h1:3bHCTIheBm1qFTcgh9oPu+nNBtX+XJIupG/vacinC
682682
github.com/vbatts/tar-split v0.11.5/go.mod h1:yZbwRsSeGjusneWgA781EKej9HF8vme8okylkAeNKLk=
683683
github.com/vburenin/ifacemaker v1.2.1 h1:3Vq8B/bfBgjWTkv+jDg4dVL1KHt3k1K4lO7XRxYA2sk=
684684
github.com/vburenin/ifacemaker v1.2.1/go.mod h1:5WqrzX2aD7/hi+okBjcaEQJMg4lDGrpuEX3B8L4Wgrs=
685-
github.com/vektra/mockery/v2 v2.42.0 h1:xnP1KXjpcc1GD8jHRjgdpRIW4LDK5MdSMrhbJizAmaI=
686-
github.com/vektra/mockery/v2 v2.42.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8=
685+
github.com/vektra/mockery/v2 v2.40.2 h1:JKuQ74IXibMCGKG6F0yvH/s2sNs1CHy/nGBP0We5DJ8=
686+
github.com/vektra/mockery/v2 v2.40.2/go.mod h1:KYBZF/7sqOa86BaOZPYsoCZWEWLS90a5oBLg2pVudxY=
687687
github.com/vvakame/sdlog v1.2.0 h1:gwZRXZ0EmhJQJN/Do/+PTQigcmFiSqZ07aDjxqGOLT8=
688688
github.com/vvakame/sdlog v1.2.0/go.mod h1:gFYv2g/iR3pJSxkJz0YnkNmhNbXT5R3PzWsfZKGQADY=
689689
github.com/xanzy/go-gitlab v0.96.0 h1:LGkZ+wSNMRtHIBaYE4Hq3dZVjprwHv3Y1+rhKU3WETs=

update/.devcontainer/install-dev-tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -o errexit
88
set -o xtrace
99

1010
# download (in the background) the same verison as used by PMM build process
11-
curl -sS https://dl.google.com/go/go1.22.0.linux-amd64.tar.gz -o /tmp/golang.tar.gz &
11+
curl -sS https://dl.google.com/go/go1.21.7.linux-amd64.tar.gz -o /tmp/golang.tar.gz &
1212

1313
# to install man pages
1414
sed -i '/nodocs/d' /etc/yum.conf

update/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
environment:
77
# for tests
88
- PMM_SERVER_IMAGE=${PMM_SERVER_IMAGE:-percona/pmm-server:2}
9-
- GO_VERSION=${GO_VERSION:-1.22.x}
9+
- GO_VERSION=${GO_VERSION:-1.21.x}
1010
- PATH=/root/go/bin:$PATH
1111
- REVIEWDOG_GITHUB_API_TOKEN=${REVIEWDOG_GITHUB_API_TOKEN}
1212
volumes:

0 commit comments

Comments
 (0)