From dd4b11a8d1b162e3a59e877ea8d7cb11b06b36f1 Mon Sep 17 00:00:00 2001 From: Stanislav Maksimov Date: Thu, 30 Nov 2023 08:45:14 -0800 Subject: [PATCH] revert bootstrap version update, and go version in checks Signed-off-by: 'Stanislav Maksimov' --- .github/docker/cluster_test_vreplication_basic/Dockerfile | 2 +- .../docker/cluster_test_vreplication_cellalias/Dockerfile | 2 +- .../docker/cluster_test_vreplication_multicell/Dockerfile | 2 +- .github/docker/cluster_test_vreplication_v2/Dockerfile | 2 +- .github/docker/unit_test_mariadb103/Dockerfile | 2 +- .github/docker/unit_test_mysql57/Dockerfile | 2 +- .github/docker/unit_test_race/Dockerfile | 2 +- .github/workflows/check_formatting.yml | 5 ++--- .github/workflows/check_imports.yml | 5 ++--- .github/workflows/check_make_parser.yml | 5 ++--- .github/workflows/check_make_sizegen.yml | 5 ++--- .github/workflows/check_make_visitor.yml | 5 ++--- .github/workflows/golangci-linter.yml | 5 ++--- 13 files changed, 19 insertions(+), 25 deletions(-) diff --git a/.github/docker/cluster_test_vreplication_basic/Dockerfile b/.github/docker/cluster_test_vreplication_basic/Dockerfile index c74c5c0c4f8..17c186d3d53 100644 --- a/.github/docker/cluster_test_vreplication_basic/Dockerfile +++ b/.github/docker/cluster_test_vreplication_basic/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile index c74c5c0c4f8..17c186d3d53 100644 --- a/.github/docker/cluster_test_vreplication_cellalias/Dockerfile +++ b/.github/docker/cluster_test_vreplication_cellalias/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/docker/cluster_test_vreplication_multicell/Dockerfile b/.github/docker/cluster_test_vreplication_multicell/Dockerfile index c74c5c0c4f8..17c186d3d53 100644 --- a/.github/docker/cluster_test_vreplication_multicell/Dockerfile +++ b/.github/docker/cluster_test_vreplication_multicell/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/docker/cluster_test_vreplication_v2/Dockerfile b/.github/docker/cluster_test_vreplication_v2/Dockerfile index c74c5c0c4f8..17c186d3d53 100644 --- a/.github/docker/cluster_test_vreplication_v2/Dockerfile +++ b/.github/docker/cluster_test_vreplication_v2/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/docker/unit_test_mariadb103/Dockerfile b/.github/docker/unit_test_mariadb103/Dockerfile index 8798b310771..75261cd27df 100644 --- a/.github/docker/unit_test_mariadb103/Dockerfile +++ b/.github/docker/unit_test_mariadb103/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103" FROM "${image}" diff --git a/.github/docker/unit_test_mysql57/Dockerfile b/.github/docker/unit_test_mysql57/Dockerfile index f9b14a28b18..513e05d289d 100644 --- a/.github/docker/unit_test_mysql57/Dockerfile +++ b/.github/docker/unit_test_mysql57/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/docker/unit_test_race/Dockerfile b/.github/docker/unit_test_race/Dockerfile index 53e3c85e84b..ecd9cfe51d0 100644 --- a/.github/docker/unit_test_race/Dockerfile +++ b/.github/docker/unit_test_race/Dockerfile @@ -1,4 +1,4 @@ -ARG bootstrap_version=3.2 +ARG bootstrap_version=3.1 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/workflows/check_formatting.yml b/.github/workflows/check_formatting.yml index baf5c105091..4a25ed89d48 100644 --- a/.github/workflows/check_formatting.yml +++ b/.github/workflows/check_formatting.yml @@ -9,10 +9,9 @@ jobs: steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v2 with: - go-version: '1.20' - check-latest: true + go-version: '1.17.12' - name: Tune the OS run: | diff --git a/.github/workflows/check_imports.yml b/.github/workflows/check_imports.yml index 67b181ede97..8d7195981e3 100644 --- a/.github/workflows/check_imports.yml +++ b/.github/workflows/check_imports.yml @@ -9,10 +9,9 @@ jobs: steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v2 with: - go-version: '1.20' - check-latest: true + go-version: '1.17.12' - name: Check out code uses: actions/checkout@v2 diff --git a/.github/workflows/check_make_parser.yml b/.github/workflows/check_make_parser.yml index 425c35b9ea1..e7046dbafd1 100644 --- a/.github/workflows/check_make_parser.yml +++ b/.github/workflows/check_make_parser.yml @@ -9,10 +9,9 @@ jobs: steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v2 with: - go-version: '1.20' - check-latest: true + go-version: '1.17.12' - name: Tune the OS run: | diff --git a/.github/workflows/check_make_sizegen.yml b/.github/workflows/check_make_sizegen.yml index 37229bd538c..6d8a403ac8d 100644 --- a/.github/workflows/check_make_sizegen.yml +++ b/.github/workflows/check_make_sizegen.yml @@ -9,10 +9,9 @@ jobs: steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v2 with: - go-version: '1.20' - check-latest: true + go-version: '1.17.12' - name: Tune the OS run: | diff --git a/.github/workflows/check_make_visitor.yml b/.github/workflows/check_make_visitor.yml index 7e4d5496d71..ec48007d220 100644 --- a/.github/workflows/check_make_visitor.yml +++ b/.github/workflows/check_make_visitor.yml @@ -9,10 +9,9 @@ jobs: steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v2 with: - go-version: '1.20' - check-latest: true + go-version: '1.17.12' - name: Tune the OS run: | diff --git a/.github/workflows/golangci-linter.yml b/.github/workflows/golangci-linter.yml index 7129ef77839..1588839c6a3 100644 --- a/.github/workflows/golangci-linter.yml +++ b/.github/workflows/golangci-linter.yml @@ -7,10 +7,9 @@ jobs: group: vitess-ubuntu20 steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v2 with: - go-version: '1.20' - check-latest: true + go-version: '1.17.12' id: go - name: Tune the OS