From c0ee8d327561218ebcbc7a89cfb1838bb2a58d96 Mon Sep 17 00:00:00 2001 From: FlorentP <35779988+frouioui@users.noreply.github.com> Date: Mon, 25 Jul 2022 15:12:26 +0200 Subject: [PATCH] Upgrade to `go1.18.4` (#10705) * Upgrade to Go 1.18.4 Signed-off-by: Florent Poinsard * Fix golangci-lint error in collations package Signed-off-by: Florent Poinsard * Reverted unwanted changes to collation package Signed-off-by: Florent Poinsard * Fix xb backup mysql80 workflow go version Signed-off-by: Florent Poinsard --- .github/docker/cluster_test_12/Dockerfile | 2 +- .github/docker/cluster_test_18/Dockerfile | 2 +- .github/workflows/check_make_vtadmin_authz_testgen.yml | 2 +- .github/workflows/check_make_vtadmin_web_proto.yml | 2 +- .github/workflows/cluster_endtoend_13.yml | 2 +- .github/workflows/cluster_endtoend_15.yml | 2 +- .github/workflows/cluster_endtoend_21.yml | 2 +- .github/workflows/cluster_endtoend_22.yml | 2 +- .github/workflows/cluster_endtoend_26.yml | 2 +- .../cluster_endtoend_ers_prs_newfeatures_heavy.yml | 2 +- .github/workflows/cluster_endtoend_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_mysql_server_vault.yml | 2 +- .../workflows/cluster_endtoend_onlineddl_declarative.yml | 2 +- .../cluster_endtoend_onlineddl_declarative_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_onlineddl_ghost.yml | 2 +- .../workflows/cluster_endtoend_onlineddl_ghost_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_onlineddl_revert.yml | 2 +- .../workflows/cluster_endtoend_onlineddl_revert_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_onlineddl_revertible.yml | 2 +- .../cluster_endtoend_onlineddl_revertible_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_onlineddl_scheduler.yml | 2 +- .../cluster_endtoend_onlineddl_scheduler_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_onlineddl_singleton.yml | 2 +- .../cluster_endtoend_onlineddl_singleton_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_onlineddl_vrepl.yml | 2 +- .../workflows/cluster_endtoend_onlineddl_vrepl_mysql80.yml | 2 +- .../workflows/cluster_endtoend_onlineddl_vrepl_stress.yml | 2 +- .../cluster_endtoend_onlineddl_vrepl_stress_mysql80.yml | 2 +- .../cluster_endtoend_onlineddl_vrepl_stress_suite.yml | 2 +- ...luster_endtoend_onlineddl_vrepl_stress_suite_mysql80.yml | 2 +- .../workflows/cluster_endtoend_onlineddl_vrepl_suite.yml | 2 +- .../cluster_endtoend_onlineddl_vrepl_suite_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_schemadiff_vrepl.yml | 2 +- .../workflows/cluster_endtoend_schemadiff_vrepl_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_tabletmanager_consul.yml | 2 +- .../workflows/cluster_endtoend_tabletmanager_tablegc.yml | 2 +- .../cluster_endtoend_tabletmanager_tablegc_mysql80.yml | 2 +- .../workflows/cluster_endtoend_tabletmanager_throttler.yml | 2 +- ...uster_endtoend_tabletmanager_throttler_custom_config.yml | 2 +- .../workflows/cluster_endtoend_topo_connection_cache.yml | 2 +- .../cluster_endtoend_vreplication_across_db_versions.yml | 2 +- .github/workflows/cluster_endtoend_vreplication_basic.yml | 2 +- .../workflows/cluster_endtoend_vreplication_cellalias.yml | 2 +- ...ster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml | 2 +- .../workflows/cluster_endtoend_vreplication_multicell.yml | 2 +- .github/workflows/cluster_endtoend_vreplication_v2.yml | 2 +- .github/workflows/cluster_endtoend_vstream_failover.yml | 2 +- .../cluster_endtoend_vstream_stoponreshard_false.yml | 2 +- .../cluster_endtoend_vstream_stoponreshard_true.yml | 2 +- .../cluster_endtoend_vstream_with_keyspaces_to_watch.yml | 2 +- .github/workflows/cluster_endtoend_vtbackup_transform.yml | 2 +- ...uster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_concurrentdml.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_gen4.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_general_heavy.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_godriver.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_queries.yml | 2 +- .../workflows/cluster_endtoend_vtgate_readafterwrite.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_reservedconn.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_schema.yml | 2 +- .../workflows/cluster_endtoend_vtgate_schema_tracker.yml | 2 +- .../cluster_endtoend_vtgate_tablet_healthcheck_cache.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_topo.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_topo_consul.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_topo_etcd.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_transaction.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_unsharded.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml | 2 +- .github/workflows/cluster_endtoend_vtgate_vschema.yml | 2 +- .github/workflows/cluster_endtoend_vtorc.yml | 2 +- .github/workflows/cluster_endtoend_vtorc_8.0.yml | 2 +- .github/workflows/cluster_endtoend_xb_backup.yml | 2 +- .github/workflows/cluster_endtoend_xb_backup_mysql80.yml | 2 +- .github/workflows/cluster_endtoend_xb_recovery.yml | 2 +- .github/workflows/create_release.yml | 2 +- .github/workflows/docker_test_cluster_10.yml | 2 +- .github/workflows/docker_test_cluster_25.yml | 2 +- .github/workflows/e2e_race.yml | 2 +- .github/workflows/endtoend.yml | 2 +- .github/workflows/local_example.yml | 2 +- .github/workflows/region_example.yml | 2 +- .github/workflows/static_checks_etc.yml | 2 +- .github/workflows/unit_race.yml | 2 +- .github/workflows/unit_test_mariadb103.yml | 2 +- .github/workflows/unit_test_mysql57.yml | 2 +- .github/workflows/unit_test_mysql80.yml | 2 +- .github/workflows/upgrade_downgrade_test_backups_e2e.yml | 2 +- .github/workflows/upgrade_downgrade_test_backups_manual.yml | 2 +- .../upgrade_downgrade_test_query_serving_queries.yml | 2 +- .../upgrade_downgrade_test_query_serving_schema.yml | 2 +- .../workflows/upgrade_downgrade_test_reparent_old_vtctl.yml | 2 +- .../upgrade_downgrade_test_reparent_old_vttablet.yml | 2 +- Makefile | 2 +- build.env | 2 +- docker/base/Dockerfile | 2 +- docker/base/Dockerfile.mariadb | 2 +- docker/base/Dockerfile.mariadb103 | 2 +- docker/base/Dockerfile.mysql80 | 2 +- docker/base/Dockerfile.percona57 | 2 +- docker/base/Dockerfile.percona80 | 2 +- docker/bootstrap/CHANGELOG.md | 4 ++++ docker/bootstrap/Dockerfile.common | 2 +- docker/bootstrap/Dockerfile.mariadb | 2 +- docker/bootstrap/Dockerfile.mariadb103 | 2 +- docker/bootstrap/Dockerfile.mysql57 | 2 +- docker/bootstrap/Dockerfile.mysql57-arm64v8 | 2 +- docker/bootstrap/Dockerfile.mysql80 | 2 +- docker/bootstrap/Dockerfile.percona57 | 2 +- docker/bootstrap/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.alpine | 2 +- docker/lite/Dockerfile.mariadb | 2 +- docker/lite/Dockerfile.mariadb103 | 2 +- docker/lite/Dockerfile.mysql57 | 2 +- docker/lite/Dockerfile.mysql80 | 2 +- docker/lite/Dockerfile.percona57 | 2 +- docker/lite/Dockerfile.percona80 | 2 +- docker/lite/Dockerfile.testing | 2 +- docker/lite/Dockerfile.ubi7.mysql57 | 2 +- docker/lite/Dockerfile.ubi7.mysql80 | 2 +- docker/lite/Dockerfile.ubi7.percona57 | 2 +- docker/lite/Dockerfile.ubi7.percona80 | 2 +- docker/lite/Dockerfile.ubi8.arm64.mysql80 | 2 +- docker/lite/Dockerfile.ubi8.mysql80 | 2 +- docker/local/Dockerfile | 2 +- docker/vttestserver/Dockerfile.mysql57 | 2 +- docker/vttestserver/Dockerfile.mysql80 | 2 +- go/vt/servenv/buildinfo_test.go | 6 +++--- test.go | 2 +- test/templates/cluster_endtoend_test.tpl | 2 +- test/templates/cluster_endtoend_test_docker.tpl | 2 +- test/templates/cluster_endtoend_test_mysql80.tpl | 2 +- test/templates/dockerfile.tpl | 2 +- test/templates/unit_test.tpl | 2 +- 133 files changed, 138 insertions(+), 134 deletions(-) diff --git a/.github/docker/cluster_test_12/Dockerfile b/.github/docker/cluster_test_12/Dockerfile index df2d0f341aa..05b26c5ad77 100644 --- a/.github/docker/cluster_test_12/Dockerfile +++ b/.github/docker/cluster_test_12/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/docker/cluster_test_18/Dockerfile b/.github/docker/cluster_test_18/Dockerfile index 2f5bb9311ac..e0165f714ca 100644 --- a/.github/docker/cluster_test_18/Dockerfile +++ b/.github/docker/cluster_test_18/Dockerfile @@ -1,6 +1,6 @@ # DO NOT MODIFY: THIS FILE IS GENERATED USING "make generate_ci_workflows" -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/.github/workflows/check_make_vtadmin_authz_testgen.yml b/.github/workflows/check_make_vtadmin_authz_testgen.yml index 744531cc244..df301a67893 100644 --- a/.github/workflows/check_make_vtadmin_authz_testgen.yml +++ b/.github/workflows/check_make_vtadmin_authz_testgen.yml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-go@v2 if: steps.changes.outputs.vtadmin_changes == 'true' with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.vtadmin_changes == 'true' diff --git a/.github/workflows/check_make_vtadmin_web_proto.yml b/.github/workflows/check_make_vtadmin_web_proto.yml index e92585434b7..d2703d54df1 100644 --- a/.github/workflows/check_make_vtadmin_web_proto.yml +++ b/.github/workflows/check_make_vtadmin_web_proto.yml @@ -29,7 +29,7 @@ jobs: uses: actions/setup-go@v2 if: steps.changes.outputs.proto_changes == 'true' with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Setup Node if: steps.changes.outputs.proto_changes == 'true' diff --git a/.github/workflows/cluster_endtoend_13.yml b/.github/workflows/cluster_endtoend_13.yml index a8b0811ab85..d9134ce1f48 100644 --- a/.github/workflows/cluster_endtoend_13.yml +++ b/.github/workflows/cluster_endtoend_13.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_15.yml b/.github/workflows/cluster_endtoend_15.yml index 93c45fda335..5a9a1c9cab2 100644 --- a/.github/workflows/cluster_endtoend_15.yml +++ b/.github/workflows/cluster_endtoend_15.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_21.yml b/.github/workflows/cluster_endtoend_21.yml index 44d23b097e7..30c2313e143 100644 --- a/.github/workflows/cluster_endtoend_21.yml +++ b/.github/workflows/cluster_endtoend_21.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_22.yml b/.github/workflows/cluster_endtoend_22.yml index 8a002c35a16..e22ed0da6a1 100644 --- a/.github/workflows/cluster_endtoend_22.yml +++ b/.github/workflows/cluster_endtoend_22.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_26.yml b/.github/workflows/cluster_endtoend_26.yml index 18ad877f6e8..bf68f6d39d0 100644 --- a/.github/workflows/cluster_endtoend_26.yml +++ b/.github/workflows/cluster_endtoend_26.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml index d2669bebf1f..39da33111e3 100644 --- a/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml +++ b/.github/workflows/cluster_endtoend_ers_prs_newfeatures_heavy.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_mysql80.yml b/.github/workflows/cluster_endtoend_mysql80.yml index 9361ff0751f..10d15df8bdf 100644 --- a/.github/workflows/cluster_endtoend_mysql80.yml +++ b/.github/workflows/cluster_endtoend_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_mysql_server_vault.yml b/.github/workflows/cluster_endtoend_mysql_server_vault.yml index 989c2b07b3d..a4bc9bd5ab1 100644 --- a/.github/workflows/cluster_endtoend_mysql_server_vault.yml +++ b/.github/workflows/cluster_endtoend_mysql_server_vault.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml index 28d954b4a55..c1cf74609cd 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_declarative.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_declarative.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_declarative_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_declarative_mysql80.yml index 1b38ea93ca2..f2a178aff0a 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_declarative_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_declarative_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml index 7f3aca894b3..451b461c366 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_ghost.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_ghost.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_ghost_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_ghost_mysql80.yml index bce048f1d38..986adfb69f0 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_ghost_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_ghost_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert.yml b/.github/workflows/cluster_endtoend_onlineddl_revert.yml index d5e526ad77d..6f2bc6efed4 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_revert.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_revert.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_revert_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_revert_mysql80.yml index d935472c276..e43a6d71a0c 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_revert_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_revert_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_revertible.yml b/.github/workflows/cluster_endtoend_onlineddl_revertible.yml index 346d292dacf..c3acde31fde 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_revertible.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_revertible.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_revertible_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_revertible_mysql80.yml index 4ce5693492b..e70bed861da 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_revertible_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_revertible_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml index 26c51bf0fbd..3aa3b593050 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_scheduler.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_scheduler_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_scheduler_mysql80.yml index 0e3e04fc077..3196826c7c6 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_scheduler_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_scheduler_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml index 92060d3686f..d1e4f631a2c 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_singleton.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_singleton.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_singleton_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_singleton_mysql80.yml index 492d34d53d2..3dbfaaa98dc 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_singleton_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_singleton_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml index cd09d5b2b37..99ac09b6ddb 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_mysql80.yml index 069a597c5fa..1246db04c26 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml index 612c77d09ee..63c8a4f766b 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_mysql80.yml index 6d43829a5b7..5918d5cc4ea 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml index 58185093918..8a56cfdddca 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite_mysql80.yml index eb9277a2085..9c175560eec 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_stress_suite_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml index 75ebc0670bc..9496006fb3f 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite_mysql80.yml b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite_mysql80.yml index 0c0749347f9..b4a1dab6428 100644 --- a/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite_mysql80.yml +++ b/.github/workflows/cluster_endtoend_onlineddl_vrepl_suite_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml index 84d3066a8cb..c962656c89d 100644 --- a/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml +++ b/.github/workflows/cluster_endtoend_schemadiff_vrepl.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_schemadiff_vrepl_mysql80.yml b/.github/workflows/cluster_endtoend_schemadiff_vrepl_mysql80.yml index e64057ca5bd..d0b3c6780bf 100644 --- a/.github/workflows/cluster_endtoend_schemadiff_vrepl_mysql80.yml +++ b/.github/workflows/cluster_endtoend_schemadiff_vrepl_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml index 60ed631416f..d1438ada79b 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_consul.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_consul.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml index 0245c9de136..8be01f65eb3 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_tabletmanager_tablegc_mysql80.yml b/.github/workflows/cluster_endtoend_tabletmanager_tablegc_mysql80.yml index 5c0ff7a21c2..884358b4edf 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_tablegc_mysql80.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_tablegc_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml index 3a4603028f9..3ffa97c0ac1 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml index 576370daeaf..e1c2c8e4e8a 100644 --- a/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml +++ b/.github/workflows/cluster_endtoend_tabletmanager_throttler_custom_config.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_topo_connection_cache.yml b/.github/workflows/cluster_endtoend_topo_connection_cache.yml index a5628f5558b..261b4d9740b 100644 --- a/.github/workflows/cluster_endtoend_topo_connection_cache.yml +++ b/.github/workflows/cluster_endtoend_topo_connection_cache.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml index 811b38ed91f..03996bfcd33 100644 --- a/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml +++ b/.github/workflows/cluster_endtoend_vreplication_across_db_versions.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vreplication_basic.yml b/.github/workflows/cluster_endtoend_vreplication_basic.yml index dfe4dca376d..1433aad0be7 100644 --- a/.github/workflows/cluster_endtoend_vreplication_basic.yml +++ b/.github/workflows/cluster_endtoend_vreplication_basic.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml index 0aaa2db953f..eedbaf331e8 100644 --- a/.github/workflows/cluster_endtoend_vreplication_cellalias.yml +++ b/.github/workflows/cluster_endtoend_vreplication_cellalias.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml b/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml index e21bcc86c19..538364dbd41 100644 --- a/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml +++ b/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vreplication_multicell.yml b/.github/workflows/cluster_endtoend_vreplication_multicell.yml index 1d9628c42c7..78d3333ba72 100644 --- a/.github/workflows/cluster_endtoend_vreplication_multicell.yml +++ b/.github/workflows/cluster_endtoend_vreplication_multicell.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vreplication_v2.yml b/.github/workflows/cluster_endtoend_vreplication_v2.yml index e20f6a48740..b001a3a485a 100644 --- a/.github/workflows/cluster_endtoend_vreplication_v2.yml +++ b/.github/workflows/cluster_endtoend_vreplication_v2.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vstream_failover.yml b/.github/workflows/cluster_endtoend_vstream_failover.yml index ad0f623a38a..ff14c919979 100644 --- a/.github/workflows/cluster_endtoend_vstream_failover.yml +++ b/.github/workflows/cluster_endtoend_vstream_failover.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml index 770362b69c1..63b32522809 100644 --- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml +++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_false.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml index 2eaea2597fb..c70f1330ff8 100644 --- a/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml +++ b/.github/workflows/cluster_endtoend_vstream_stoponreshard_true.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vstream_with_keyspaces_to_watch.yml b/.github/workflows/cluster_endtoend_vstream_with_keyspaces_to_watch.yml index 0ced22c6d5f..a1d9c7e23a9 100644 --- a/.github/workflows/cluster_endtoend_vstream_with_keyspaces_to_watch.yml +++ b/.github/workflows/cluster_endtoend_vstream_with_keyspaces_to_watch.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtbackup_transform.yml b/.github/workflows/cluster_endtoend_vtbackup_transform.yml index ac6fde7e145..000df19a0b8 100644 --- a/.github/workflows/cluster_endtoend_vtbackup_transform.yml +++ b/.github/workflows/cluster_endtoend_vtbackup_transform.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml index e1d981ec7da..25f80c4d4d4 100644 --- a/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml +++ b/.github/workflows/cluster_endtoend_vtctlbackup_sharded_clustertest_heavy.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml index 5efda162305..586e0c32818 100644 --- a/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml +++ b/.github/workflows/cluster_endtoend_vtgate_concurrentdml.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_gen4.yml b/.github/workflows/cluster_endtoend_vtgate_gen4.yml index 70604c1a927..86c2a5615e3 100644 --- a/.github/workflows/cluster_endtoend_vtgate_gen4.yml +++ b/.github/workflows/cluster_endtoend_vtgate_gen4.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml index 071cb90dd71..c16973eb230 100644 --- a/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml +++ b/.github/workflows/cluster_endtoend_vtgate_general_heavy.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_godriver.yml b/.github/workflows/cluster_endtoend_vtgate_godriver.yml index 48feadace0e..a28481b6d35 100644 --- a/.github/workflows/cluster_endtoend_vtgate_godriver.yml +++ b/.github/workflows/cluster_endtoend_vtgate_godriver.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_queries.yml b/.github/workflows/cluster_endtoend_vtgate_queries.yml index 4de13e81f5c..04ed29773a2 100644 --- a/.github/workflows/cluster_endtoend_vtgate_queries.yml +++ b/.github/workflows/cluster_endtoend_vtgate_queries.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml index 3957a2c3fc1..cdde1ef2655 100644 --- a/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml +++ b/.github/workflows/cluster_endtoend_vtgate_readafterwrite.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml index 862b11e0451..a4444277767 100644 --- a/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml +++ b/.github/workflows/cluster_endtoend_vtgate_reservedconn.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_schema.yml b/.github/workflows/cluster_endtoend_vtgate_schema.yml index 0687f9c2d83..43c27bf8158 100644 --- a/.github/workflows/cluster_endtoend_vtgate_schema.yml +++ b/.github/workflows/cluster_endtoend_vtgate_schema.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml index f1435753f2c..72dc393e9ae 100644 --- a/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml +++ b/.github/workflows/cluster_endtoend_vtgate_schema_tracker.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml index 3708b8b02d8..ff9f94d23b7 100644 --- a/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml +++ b/.github/workflows/cluster_endtoend_vtgate_tablet_healthcheck_cache.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_topo.yml b/.github/workflows/cluster_endtoend_vtgate_topo.yml index f669aed497f..837d12eae0b 100644 --- a/.github/workflows/cluster_endtoend_vtgate_topo.yml +++ b/.github/workflows/cluster_endtoend_vtgate_topo.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml index fd56e992922..ac58e24e29a 100644 --- a/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml +++ b/.github/workflows/cluster_endtoend_vtgate_topo_consul.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml index b783ca25abf..15b93e14ab9 100644 --- a/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml +++ b/.github/workflows/cluster_endtoend_vtgate_topo_etcd.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_transaction.yml b/.github/workflows/cluster_endtoend_vtgate_transaction.yml index f29fef847f3..922a4274474 100644 --- a/.github/workflows/cluster_endtoend_vtgate_transaction.yml +++ b/.github/workflows/cluster_endtoend_vtgate_transaction.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml index 3c02a6aeb87..e48efe23733 100644 --- a/.github/workflows/cluster_endtoend_vtgate_unsharded.yml +++ b/.github/workflows/cluster_endtoend_vtgate_unsharded.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml index 8b29862836f..49a75a967bb 100644 --- a/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml +++ b/.github/workflows/cluster_endtoend_vtgate_vindex_heavy.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtgate_vschema.yml b/.github/workflows/cluster_endtoend_vtgate_vschema.yml index 22e3e432329..fb7415f979f 100644 --- a/.github/workflows/cluster_endtoend_vtgate_vschema.yml +++ b/.github/workflows/cluster_endtoend_vtgate_vschema.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtorc.yml b/.github/workflows/cluster_endtoend_vtorc.yml index e148c43c39a..0ffeebc25df 100644 --- a/.github/workflows/cluster_endtoend_vtorc.yml +++ b/.github/workflows/cluster_endtoend_vtorc.yml @@ -42,7 +42,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_vtorc_8.0.yml b/.github/workflows/cluster_endtoend_vtorc_8.0.yml index f283739c264..f28e53e661b 100644 --- a/.github/workflows/cluster_endtoend_vtorc_8.0.yml +++ b/.github/workflows/cluster_endtoend_vtorc_8.0.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_xb_backup.yml b/.github/workflows/cluster_endtoend_xb_backup.yml index 750d36a722a..a28ee54bb3c 100644 --- a/.github/workflows/cluster_endtoend_xb_backup.yml +++ b/.github/workflows/cluster_endtoend_xb_backup.yml @@ -46,7 +46,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_xb_backup_mysql80.yml b/.github/workflows/cluster_endtoend_xb_backup_mysql80.yml index fd64640e483..8cb546f9cac 100644 --- a/.github/workflows/cluster_endtoend_xb_backup_mysql80.yml +++ b/.github/workflows/cluster_endtoend_xb_backup_mysql80.yml @@ -43,7 +43,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/cluster_endtoend_xb_recovery.yml b/.github/workflows/cluster_endtoend_xb_recovery.yml index 7a2ae965b08..23c01723ef7 100644 --- a/.github/workflows/cluster_endtoend_xb_recovery.yml +++ b/.github/workflows/cluster_endtoend_xb_recovery.yml @@ -46,7 +46,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 3f90ab17de5..ed00faed7d8 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS run: | diff --git a/.github/workflows/docker_test_cluster_10.yml b/.github/workflows/docker_test_cluster_10.yml index 22549236022..df6379dfa5f 100644 --- a/.github/workflows/docker_test_cluster_10.yml +++ b/.github/workflows/docker_test_cluster_10.yml @@ -32,7 +32,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/docker_test_cluster_25.yml b/.github/workflows/docker_test_cluster_25.yml index 1fb5b6989af..75f61cd81db 100644 --- a/.github/workflows/docker_test_cluster_25.yml +++ b/.github/workflows/docker_test_cluster_25.yml @@ -32,7 +32,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml index ab1d8b0e4fd..0a55f376706 100644 --- a/.github/workflows/e2e_race.yml +++ b/.github/workflows/e2e_race.yml @@ -30,7 +30,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml index 6abc66ded73..591dbd55245 100644 --- a/.github/workflows/endtoend.yml +++ b/.github/workflows/endtoend.yml @@ -30,7 +30,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml index ee2a0d1533a..e22f21e501a 100644 --- a/.github/workflows/local_example.yml +++ b/.github/workflows/local_example.yml @@ -36,7 +36,7 @@ jobs: if: steps.changes.outputs.examples == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.examples == 'true' diff --git a/.github/workflows/region_example.yml b/.github/workflows/region_example.yml index 5b40f9a2912..f3b74fe3889 100644 --- a/.github/workflows/region_example.yml +++ b/.github/workflows/region_example.yml @@ -36,7 +36,7 @@ jobs: if: steps.changes.outputs.examples == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.examples == 'true' diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml index 6943520a521..3907a746d09 100644 --- a/.github/workflows/static_checks_etc.yml +++ b/.github/workflows/static_checks_etc.yml @@ -70,7 +70,7 @@ jobs: if: steps.changes.outputs.go_files == 'true' || steps.changes.outputs.parser_changes == 'true' || steps.changes.outputs.proto_changes == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.go_files == 'true' diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml index 37e626d61f1..91115d40eb0 100644 --- a/.github/workflows/unit_race.yml +++ b/.github/workflows/unit_race.yml @@ -34,7 +34,7 @@ jobs: if: steps.changes.outputs.unit_tests == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.unit_tests == 'true' diff --git a/.github/workflows/unit_test_mariadb103.yml b/.github/workflows/unit_test_mariadb103.yml index e6e076d66b5..b78c11230ca 100644 --- a/.github/workflows/unit_test_mariadb103.yml +++ b/.github/workflows/unit_test_mariadb103.yml @@ -36,7 +36,7 @@ jobs: if: steps.changes.outputs.unit_tests == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.unit_tests == 'true' diff --git a/.github/workflows/unit_test_mysql57.yml b/.github/workflows/unit_test_mysql57.yml index 2d9f08ad5f3..9e7fcc0eb6b 100644 --- a/.github/workflows/unit_test_mysql57.yml +++ b/.github/workflows/unit_test_mysql57.yml @@ -36,7 +36,7 @@ jobs: if: steps.changes.outputs.unit_tests == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.unit_tests == 'true' diff --git a/.github/workflows/unit_test_mysql80.yml b/.github/workflows/unit_test_mysql80.yml index 5b53c37b64d..2902ad03d3a 100644 --- a/.github/workflows/unit_test_mysql80.yml +++ b/.github/workflows/unit_test_mysql80.yml @@ -36,7 +36,7 @@ jobs: if: steps.changes.outputs.unit_tests == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.unit_tests == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml index 149f6471beb..fb18f663de3 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml @@ -62,7 +62,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual.yml b/.github/workflows/upgrade_downgrade_test_backups_manual.yml index 981b91177ca..3e628e4dde0 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_manual.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_manual.yml @@ -64,7 +64,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml index e95956b44dc..b1b16e9e2a4 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml @@ -66,7 +66,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml index 4daf39a818a..e79b104db77 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml @@ -65,7 +65,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml index b2c0ef5155f..ede714a953c 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml @@ -65,7 +65,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml index 78dcb0505ea..044ddc64773 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml @@ -67,7 +67,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/Makefile b/Makefile index 8cc06802694..903b9c0f428 100644 --- a/Makefile +++ b/Makefile @@ -256,7 +256,7 @@ $(PROTO_GO_OUTS): minimaltools install_protoc-gen-go proto/*.proto # This rule builds the bootstrap images for all flavors. DOCKER_IMAGES_FOR_TEST = mariadb mariadb103 mysql57 mysql80 percona57 percona80 DOCKER_IMAGES = common $(DOCKER_IMAGES_FOR_TEST) -BOOTSTRAP_VERSION=9 +BOOTSTRAP_VERSION=10 ensure_bootstrap_version: find docker/ -type f -exec sed -i "s/^\(ARG bootstrap_version\)=.*/\1=${BOOTSTRAP_VERSION}/" {} \; sed -i 's/\(^.*flag.String(\"bootstrap-version\",\) *\"[^\"]\+\"/\1 \"${BOOTSTRAP_VERSION}\"/' test.go diff --git a/build.env b/build.env index a2bec3b2065..5c59fabd586 100755 --- a/build.env +++ b/build.env @@ -17,7 +17,7 @@ source ./tools/shell_functions.inc go version >/dev/null 2>&1 || fail "Go is not installed or is not in \$PATH. See https://vitess.io/contributing/build-from-source for install instructions." -goversion_min 1.18.3 || fail "Go version reported: `go version`. Version 1.18.3+ required. See https://vitess.io/contributing/build-from-source for install instructions." +goversion_min 1.18.4 || fail "Go version reported: `go version`. Version 1.18.4+ required. See https://vitess.io/contributing/build-from-source for install instructions." mkdir -p dist mkdir -p bin diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 7569dbeb267..74515fc193f 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -21,7 +21,7 @@ # TODO(mberlin): Remove the symlink and this note once # https://github.com/docker/hub-feedback/issues/292 is fixed. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb index 2d110096417..d8f8467fef3 100644 --- a/docker/base/Dockerfile.mariadb +++ b/docker/base/Dockerfile.mariadb @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb" FROM "${image}" diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103 index 310fbdae9dd..bc1db6bea54 100644 --- a/docker/base/Dockerfile.mariadb103 +++ b/docker/base/Dockerfile.mariadb103 @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103" FROM "${image}" diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80 index 1ecf0095833..6e1f7e1dc60 100644 --- a/docker/base/Dockerfile.mysql80 +++ b/docker/base/Dockerfile.mysql80 @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index 434625cdbee..47fc1e02889 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80 index 2f45ec65968..05098d94db3 100644 --- a/docker/base/Dockerfile.percona80 +++ b/docker/base/Dockerfile.percona80 @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" diff --git a/docker/bootstrap/CHANGELOG.md b/docker/bootstrap/CHANGELOG.md index 45848e58389..c2a435124cf 100644 --- a/docker/bootstrap/CHANGELOG.md +++ b/docker/bootstrap/CHANGELOG.md @@ -38,3 +38,7 @@ List of changes between bootstrap image versions. ### Changes - Update build to golang 1.18.3 +## [10] - 2022-07-13 +### Changes +- Update build to golang 1.18.4 + diff --git a/docker/bootstrap/Dockerfile.common b/docker/bootstrap/Dockerfile.common index 4397908ee02..d4185ebe28e 100644 --- a/docker/bootstrap/Dockerfile.common +++ b/docker/bootstrap/Dockerfile.common @@ -1,4 +1,4 @@ -FROM golang:1.18.3-buster +FROM --platform=linux/amd64 golang:1.18.4-buster # Install Vitess build dependencies RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ diff --git a/docker/bootstrap/Dockerfile.mariadb b/docker/bootstrap/Dockerfile.mariadb index bff31af344d..3031008b1ef 100644 --- a/docker/bootstrap/Dockerfile.mariadb +++ b/docker/bootstrap/Dockerfile.mariadb @@ -1,7 +1,7 @@ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/amd64 "${image}" # Install MariaDB 10 RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ diff --git a/docker/bootstrap/Dockerfile.mariadb103 b/docker/bootstrap/Dockerfile.mariadb103 index a7365d3fe98..3fa54692eb1 100644 --- a/docker/bootstrap/Dockerfile.mariadb103 +++ b/docker/bootstrap/Dockerfile.mariadb103 @@ -1,7 +1,7 @@ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/amd64 "${image}" # Install MariaDB 10.3 RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \ diff --git a/docker/bootstrap/Dockerfile.mysql57 b/docker/bootstrap/Dockerfile.mysql57 index 73413d534ae..4e9b335ddac 100644 --- a/docker/bootstrap/Dockerfile.mysql57 +++ b/docker/bootstrap/Dockerfile.mysql57 @@ -1,7 +1,7 @@ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/amd64 "${image}" # Install MySQL 5.7 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends gnupg dirmngr ca-certificates && \ diff --git a/docker/bootstrap/Dockerfile.mysql57-arm64v8 b/docker/bootstrap/Dockerfile.mysql57-arm64v8 index 69304140dda..96b08413aa1 100644 --- a/docker/bootstrap/Dockerfile.mysql57-arm64v8 +++ b/docker/bootstrap/Dockerfile.mysql57-arm64v8 @@ -36,7 +36,7 @@ RUN apt-get update && \ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/arm64/v8 "${image}" # Install MySQL 5.7 RUN add-apt-repository 'deb http://ftp.debian.org/debian sid main' && \ diff --git a/docker/bootstrap/Dockerfile.mysql80 b/docker/bootstrap/Dockerfile.mysql80 index 3ae0a3b63b7..e064c638d99 100644 --- a/docker/bootstrap/Dockerfile.mysql80 +++ b/docker/bootstrap/Dockerfile.mysql80 @@ -1,7 +1,7 @@ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/amd64 "${image}" # Install MySQL 8.0 RUN for i in $(seq 1 10); do apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 8C718D3B5072E1F5 && break; done && \ diff --git a/docker/bootstrap/Dockerfile.percona57 b/docker/bootstrap/Dockerfile.percona57 index a7a90b1fe21..2d8beb5e95d 100644 --- a/docker/bootstrap/Dockerfile.percona57 +++ b/docker/bootstrap/Dockerfile.percona57 @@ -1,7 +1,7 @@ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/amd64 "${image}" # Install Percona 5.7 RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done && \ diff --git a/docker/bootstrap/Dockerfile.percona80 b/docker/bootstrap/Dockerfile.percona80 index 9d402ccac03..5dadc32cd0a 100644 --- a/docker/bootstrap/Dockerfile.percona80 +++ b/docker/bootstrap/Dockerfile.percona80 @@ -1,7 +1,7 @@ ARG bootstrap_version ARG image="vitess/bootstrap:${bootstrap_version}-common" -FROM "${image}" +FROM --platform=linux/amd64 "${image}" # Install Percona 8.0 RUN for i in $(seq 1 10); do apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 9334A25F8507EFA5 && break; done \ diff --git a/docker/lite/Dockerfile.alpine b/docker/lite/Dockerfile.alpine index 320d6ac36e7..ddc569bf127 100644 --- a/docker/lite/Dockerfile.alpine +++ b/docker/lite/Dockerfile.alpine @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mariadb b/docker/lite/Dockerfile.mariadb index 32e73efdd03..65e64e4416a 100644 --- a/docker/lite/Dockerfile.mariadb +++ b/docker/lite/Dockerfile.mariadb @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mariadb103 b/docker/lite/Dockerfile.mariadb103 index 4f224c8e390..09beb59913c 100644 --- a/docker/lite/Dockerfile.mariadb103 +++ b/docker/lite/Dockerfile.mariadb103 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mysql57 b/docker/lite/Dockerfile.mysql57 index 36968303b6b..a9a7316f7fd 100644 --- a/docker/lite/Dockerfile.mysql57 +++ b/docker/lite/Dockerfile.mysql57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.mysql80 b/docker/lite/Dockerfile.mysql80 index d0705ca04b0..acda84b18f4 100644 --- a/docker/lite/Dockerfile.mysql80 +++ b/docker/lite/Dockerfile.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona57 b/docker/lite/Dockerfile.percona57 index 83aed3c295a..8894c27c19c 100644 --- a/docker/lite/Dockerfile.percona57 +++ b/docker/lite/Dockerfile.percona57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index 3cd41c7aeed..ebd5fb7e7e1 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.testing b/docker/lite/Dockerfile.testing index 9039017052c..5a7e946b893 100644 --- a/docker/lite/Dockerfile.testing +++ b/docker/lite/Dockerfile.testing @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql57 b/docker/lite/Dockerfile.ubi7.mysql57 index 01dc9dfc01c..4b4cebe2aaf 100644 --- a/docker/lite/Dockerfile.ubi7.mysql57 +++ b/docker/lite/Dockerfile.ubi7.mysql57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.mysql80 b/docker/lite/Dockerfile.ubi7.mysql80 index 1d6d8c8f3cb..a7d4eb514b8 100644 --- a/docker/lite/Dockerfile.ubi7.mysql80 +++ b/docker/lite/Dockerfile.ubi7.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona57 b/docker/lite/Dockerfile.ubi7.percona57 index 28ffd1412d2..83193a9cf23 100644 --- a/docker/lite/Dockerfile.ubi7.percona57 +++ b/docker/lite/Dockerfile.ubi7.percona57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi7.percona80 b/docker/lite/Dockerfile.ubi7.percona80 index 783c44aa16f..d66d89ccd3d 100644 --- a/docker/lite/Dockerfile.ubi7.percona80 +++ b/docker/lite/Dockerfile.ubi7.percona80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.arm64.mysql80 b/docker/lite/Dockerfile.ubi8.arm64.mysql80 index 1dfa46d490a..9ec1f47bbf6 100644 --- a/docker/lite/Dockerfile.ubi8.arm64.mysql80 +++ b/docker/lite/Dockerfile.ubi8.arm64.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/lite/Dockerfile.ubi8.mysql80 b/docker/lite/Dockerfile.ubi8.mysql80 index 4e9ca50d4c5..3c25a36ec7a 100644 --- a/docker/lite/Dockerfile.ubi8.mysql80 +++ b/docker/lite/Dockerfile.ubi8.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile index 9ed5dcbc351..a76b7fdca01 100644 --- a/docker/local/Dockerfile +++ b/docker/local/Dockerfile @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-common" FROM "${image}" diff --git a/docker/vttestserver/Dockerfile.mysql57 b/docker/vttestserver/Dockerfile.mysql57 index 05613e907f4..7856c83bd12 100644 --- a/docker/vttestserver/Dockerfile.mysql57 +++ b/docker/vttestserver/Dockerfile.mysql57 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" AS builder diff --git a/docker/vttestserver/Dockerfile.mysql80 b/docker/vttestserver/Dockerfile.mysql80 index dbccf093e30..620d4eea6d5 100644 --- a/docker/vttestserver/Dockerfile.mysql80 +++ b/docker/vttestserver/Dockerfile.mysql80 @@ -17,7 +17,7 @@ # ensure images contain the right binaries. # Use a temporary layer for the build stage. -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" AS builder diff --git a/go/vt/servenv/buildinfo_test.go b/go/vt/servenv/buildinfo_test.go index d37b796cf51..64bd2c3f32c 100644 --- a/go/vt/servenv/buildinfo_test.go +++ b/go/vt/servenv/buildinfo_test.go @@ -33,17 +33,17 @@ func TestVersionString(t *testing.T) { buildTimePretty: "time is now", buildGitRev: "d54b87ca0be09b678bb4490060e8f23f890ddb92", buildGitBranch: "gitBranch", - goVersion: "1.18.3", + goVersion: "1.18.4", goOS: "amiga", goArch: "amd64", version: "v1.2.3-SNAPSHOT", } - assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Git revision d54b87ca0be09b678bb4490060e8f23f890ddb92 branch 'gitBranch') built on time is now by user@host using 1.18.3 amiga/amd64", v.String()) + assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Git revision d54b87ca0be09b678bb4490060e8f23f890ddb92 branch 'gitBranch') built on time is now by user@host using 1.18.4 amiga/amd64", v.String()) v.jenkinsBuildNumber = 422 - assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Jenkins build 422) (Git revision d54b87ca0be09b678bb4490060e8f23f890ddb92 branch 'gitBranch') built on time is now by user@host using 1.18.3 amiga/amd64", v.String()) + assert.Equal(t, "Version: v1.2.3-SNAPSHOT (Jenkins build 422) (Git revision d54b87ca0be09b678bb4490060e8f23f890ddb92 branch 'gitBranch') built on time is now by user@host using 1.18.4 amiga/amd64", v.String()) assert.Equal(t, "5.7.9-vitess-v1.2.3-SNAPSHOT", v.MySQLVersion()) } diff --git a/test.go b/test.go index 56dbee846c7..e9518405f59 100755 --- a/test.go +++ b/test.go @@ -74,7 +74,7 @@ For example: // Flags var ( flavor = flag.String("flavor", "mysql57", "comma-separated bootstrap flavor(s) to run against (when using Docker mode). Available flavors: all,"+flavors) - bootstrapVersion = flag.String("bootstrap-version", "9", "the version identifier to use for the docker images") + bootstrapVersion = flag.String("bootstrap-version", "10", "the version identifier to use for the docker images") runCount = flag.Int("runs", 1, "run each test this many times") retryMax = flag.Int("retry", 3, "max number of retries, to detect flaky tests") logPass = flag.Bool("log-pass", false, "log test output even if it passes") diff --git a/test/templates/cluster_endtoend_test.tpl b/test/templates/cluster_endtoend_test.tpl index 3eb5b9909c1..a29de4eba3c 100644 --- a/test/templates/cluster_endtoend_test.tpl +++ b/test/templates/cluster_endtoend_test.tpl @@ -45,7 +45,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/test/templates/cluster_endtoend_test_docker.tpl b/test/templates/cluster_endtoend_test_docker.tpl index a8548e14666..60d57287642 100644 --- a/test/templates/cluster_endtoend_test_docker.tpl +++ b/test/templates/cluster_endtoend_test_docker.tpl @@ -32,7 +32,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.end_to_end == 'true' diff --git a/test/templates/cluster_endtoend_test_mysql80.tpl b/test/templates/cluster_endtoend_test_mysql80.tpl index 015a808601a..2a27cc092f5 100644 --- a/test/templates/cluster_endtoend_test_mysql80.tpl +++ b/test/templates/cluster_endtoend_test_mysql80.tpl @@ -41,7 +41,7 @@ jobs: if: steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Set up python if: steps.changes.outputs.end_to_end == 'true' diff --git a/test/templates/dockerfile.tpl b/test/templates/dockerfile.tpl index 202a97ee623..ece1358e68c 100644 --- a/test/templates/dockerfile.tpl +++ b/test/templates/dockerfile.tpl @@ -1,4 +1,4 @@ -ARG bootstrap_version=9 +ARG bootstrap_version=10 ARG image="vitess/bootstrap:${bootstrap_version}-{{.Platform}}" FROM "${image}" diff --git a/test/templates/unit_test.tpl b/test/templates/unit_test.tpl index 6e8b0861ba9..3ecbd142cc7 100644 --- a/test/templates/unit_test.tpl +++ b/test/templates/unit_test.tpl @@ -34,7 +34,7 @@ jobs: if: steps.changes.outputs.unit_tests == 'true' uses: actions/setup-go@v2 with: - go-version: 1.18.3 + go-version: 1.18.4 - name: Tune the OS if: steps.changes.outputs.unit_tests == 'true'