Skip to content

Commit 2a43299

Browse files
vitess-bot[bot]Vitess Bot
vitess-bot[bot]
authored and
Vitess Bot
committed
Cherry-pick 802b55e with conflicts
1 parent 4fe6b22 commit 2a43299

14 files changed

+101
-22
lines changed

‎.github/workflows/codecov.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ jobs:
6666
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
6767
6868
mkdir -p dist bin
69-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
70-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
69+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
70+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
7171
7272
go mod download
7373
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_race.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_race_evalengine.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get -qq install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_test_evalengine_mysql57.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_test_evalengine_mysql80.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_test_evalengine_mysql84.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_test_mysql57.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_test_mysql80.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎.github/workflows/unit_test_mysql84.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
sudo apt-get install -y make unzip g++ curl git wget ant openjdk-11-jdk
8686
8787
mkdir -p dist bin
88-
curl -s -L https://github.com/coreos/etcd/releases/download/v3.5.17/etcd-v3.5.17-linux-amd64.tar.gz | tar -zxC dist
89-
mv dist/etcd-v3.5.17-linux-amd64/{etcd,etcdctl} bin/
88+
curl --max-time 10 --retry 3 --retry-max-time 45 -s -L https://github.com/coreos/etcd/releases/download/v3.5.25/etcd-v3.5.25-linux-amd64.tar.gz | tar -zxC dist
89+
mv dist/etcd-v3.5.25-linux-amd64/{etcd,etcdctl} bin/
9090
9191
go mod download
9292
go install golang.org/x/tools/cmd/goimports@latest

‎build.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export VTDATAROOT="${VTDATAROOT:-${VTROOT}/vtdataroot}"
2929
export PATH="$PWD/bin:$PATH"
3030
export PROTOC_VER=21.3
3131
export ZK_VER=${ZK_VERSION:-3.8.0}
32-
export ETCD_VER=v3.5.17
32+
export ETCD_VER=v3.5.25
3333
export CONSUL_VER=1.11.4
3434
export TOXIPROXY_VER=v2.7.0
3535

0 commit comments

Comments
 (0)