From f90a96001137066adb1b7a92f3c2ddcd02318ed7 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Tue, 9 Jul 2024 21:22:53 +0200 Subject: [PATCH] merge conflict fixes Signed-off-by: Tim Vaillancourt --- .github/workflows/assign_milestone.yml | 4 -- .../check_make_vtadmin_authz_testgen.yml | 4 -- .../check_make_vtadmin_web_proto.yml | 4 -- .github/workflows/codeql_analysis.yml | 4 -- .github/workflows/create_release.yml | 56 ------------------- .github/workflows/docker_test_cluster_10.yml | 4 -- .github/workflows/docker_test_cluster_25.yml | 4 -- .github/workflows/e2e_race.yml | 4 -- .github/workflows/endtoend.yml | 4 -- .github/workflows/local_example.yml | 4 -- .github/workflows/region_example.yml | 4 -- .github/workflows/static_checks_etc.yml | 4 -- .github/workflows/unit_race.yml | 4 -- .../workflows/update_golang_dependencies.yml | 4 -- .github/workflows/update_golang_version.yml | 4 -- .../upgrade_downgrade_test_backups_e2e.yml | 4 -- ...owngrade_test_backups_e2e_next_release.yml | 4 -- .../upgrade_downgrade_test_backups_manual.yml | 4 -- ...grade_test_backups_manual_next_release.yml | 4 -- ...e_downgrade_test_query_serving_queries.yml | 4 -- ...est_query_serving_queries_next_release.yml | 4 -- ...de_downgrade_test_query_serving_schema.yml | 4 -- ...test_query_serving_schema_next_release.yml | 4 -- ...rade_downgrade_test_reparent_new_vtctl.yml | 4 -- ...e_downgrade_test_reparent_new_vttablet.yml | 4 -- ...rade_downgrade_test_reparent_old_vtctl.yml | 4 -- ...e_downgrade_test_reparent_old_vttablet.yml | 4 -- 27 files changed, 160 deletions(-) delete mode 100644 .github/workflows/create_release.yml diff --git a/.github/workflows/assign_milestone.yml b/.github/workflows/assign_milestone.yml index 7e13c2215e1..443d28e80d6 100644 --- a/.github/workflows/assign_milestone.yml +++ b/.github/workflows/assign_milestone.yml @@ -20,11 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/check_make_vtadmin_authz_testgen.yml b/.github/workflows/check_make_vtadmin_authz_testgen.yml index c451a0d0b2d..b0dc2e8305b 100644 --- a/.github/workflows/check_make_vtadmin_authz_testgen.yml +++ b/.github/workflows/check_make_vtadmin_authz_testgen.yml @@ -47,11 +47,7 @@ jobs: uses: actions/setup-go@v5 if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.vtadmin_changes == 'true' with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 3c7fee3df50..30aebd0b1fb 100644 --- a/.github/workflows/check_make_vtadmin_web_proto.yml +++ b/.github/workflows/check_make_vtadmin_web_proto.yml @@ -49,11 +49,7 @@ jobs: uses: actions/setup-go@v5 if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true' with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Setup Node if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.proto_changes == 'true' diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml index 1fb8e265ced..5270c01b63b 100644 --- a/.github/workflows/codeql_analysis.yml +++ b/.github/workflows/codeql_analysis.yml @@ -32,11 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml deleted file mode 100644 index b7183d5e2b5..00000000000 --- a/.github/workflows/create_release.yml +++ /dev/null @@ -1,56 +0,0 @@ -# This creates a {tar.gz,deb,rpm} file and uploads it to a release. -# To trigger this, create a new release.. but make sure that you publish -# it immediately and do not save it as a DRAFT. - -name: Release -on: - release: - types: [created] - -permissions: read-all - -jobs: - build: - name: Create Release - runs-on: ubuntu-22.04 - permissions: - contents: write - steps: - - - name: Set up Go - uses: actions/setup-go@v5 - with: -<<<<<<< HEAD - go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - - - name: Setup node - uses: actions/setup-node@v4 - with: - node-version: '18.16.0' - - - name: Tune the OS - run: | - sudo sysctl -w net.ipv4.ip_local_port_range="22768 65535" - - - name: Check out code - uses: actions/checkout@v4 - - - name: Get dependencies - run: | - sudo apt-get update - sudo apt-get install -y make ruby ruby-dev - go mod download - sudo gem install fpm - - - name: Make Packages - run: | - ./tools/make-release-packages.sh - - - name: Upload Files - uses: csexton/release-asset-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - pattern: "releases/*.{tar.gz,rpm,deb}" diff --git a/.github/workflows/docker_test_cluster_10.yml b/.github/workflows/docker_test_cluster_10.yml index 18a1c93ea73..912a7324479 100644 --- a/.github/workflows/docker_test_cluster_10.yml +++ b/.github/workflows/docker_test_cluster_10.yml @@ -52,11 +52,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 5d298ec4271..7ebe8e3cef0 100644 --- a/.github/workflows/docker_test_cluster_25.yml +++ b/.github/workflows/docker_test_cluster_25.yml @@ -52,11 +52,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml index f5ba0982d61..7fa5ae58e3e 100644 --- a/.github/workflows/e2e_race.yml +++ b/.github/workflows/e2e_race.yml @@ -50,11 +50,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml index e93c656dfed..da0568196f0 100644 --- a/.github/workflows/endtoend.yml +++ b/.github/workflows/endtoend.yml @@ -50,11 +50,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml index 854e8dc7164..72ec3234ccc 100644 --- a/.github/workflows/local_example.yml +++ b/.github/workflows/local_example.yml @@ -55,11 +55,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.examples == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - uses: actions/setup-node@v4 if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.examples == 'true' diff --git a/.github/workflows/region_example.yml b/.github/workflows/region_example.yml index 0552927a62f..4edbaa7f7dd 100644 --- a/.github/workflows/region_example.yml +++ b/.github/workflows/region_example.yml @@ -55,11 +55,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.examples == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - uses: actions/setup-node@v4 if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.examples == 'true' diff --git a/.github/workflows/static_checks_etc.yml b/.github/workflows/static_checks_etc.yml index 30a3d5549ca..3bb499d4dcf 100644 --- a/.github/workflows/static_checks_etc.yml +++ b/.github/workflows/static_checks_etc.yml @@ -115,11 +115,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && (steps.changes.outputs.go_files == 'true' || steps.changes.outputs.parser_changes == 'true' || steps.changes.outputs.proto_changes == 'true') uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.go_files == 'true' diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml index 47dba02050a..5a59956afc7 100644 --- a/.github/workflows/unit_race.yml +++ b/.github/workflows/unit_race.yml @@ -55,11 +55,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.unit_tests == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Tune the OS if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.unit_tests == 'true' diff --git a/.github/workflows/update_golang_dependencies.yml b/.github/workflows/update_golang_dependencies.yml index 6a66474868e..b416c09f949 100644 --- a/.github/workflows/update_golang_dependencies.yml +++ b/.github/workflows/update_golang_dependencies.yml @@ -19,11 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/update_golang_version.yml b/.github/workflows/update_golang_version.yml index 911f458b451..519fac82482 100644 --- a/.github/workflows/update_golang_version.yml +++ b/.github/workflows/update_golang_version.yml @@ -22,11 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Check out code uses: actions/checkout@v4 diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml index 38177204ae5..aaa3cb42f9c 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_e2e.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_e2e.yml @@ -73,14 +73,10 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 - name: Setup github.com/slackhq/vitess-additions access token run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml b/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml index a1ff56572c6..b497d4bbea0 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_e2e_next_release.yml @@ -72,11 +72,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 1ff639c3fa7..ab5021de227 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_manual.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_manual.yml @@ -77,14 +77,10 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 - name: Setup github.com/slackhq/vitess-additions access token run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml b/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml index 95f959b3560..819c1f8c0c9 100644 --- a/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_backups_manual_next_release.yml @@ -75,11 +75,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 3430224bec1..6eb117d1a2b 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries.yml @@ -76,14 +76,10 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 - name: Setup github.com/slackhq/vitess-additions access token run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml index ae7bfcacae2..a666e7a90fd 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml @@ -74,11 +74,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 2fe52720346..73eae4acaac 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema.yml @@ -76,14 +76,10 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 - name: Setup github.com/slackhq/vitess-additions access token run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml index ff615722617..6c30b4acb05 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_schema_next_release.yml @@ -74,11 +74,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml index eba727db074..e9b33cdce90 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_new_vtctl.yml @@ -74,11 +74,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' diff --git a/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml b/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml index ae819f32f3f..e6b61526419 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_new_vttablet.yml @@ -74,11 +74,7 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 da69e2b0dd8..8d5ee34b85e 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vtctl.yml @@ -76,14 +76,10 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 - name: Setup github.com/slackhq/vitess-additions access token run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && 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 fc7c9e4a5b7..5ce2f6ac521 100644 --- a/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml +++ b/.github/workflows/upgrade_downgrade_test_reparent_old_vttablet.yml @@ -76,14 +76,10 @@ jobs: if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true' uses: actions/setup-go@v5 with: -<<<<<<< HEAD go-version: 1.22.5 - name: Setup github.com/slackhq/vitess-additions access token run: git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ -======= - go-version: 1.22.5 ->>>>>>> c60a5ea6b3 ([release-19.0] Upgrade the Golang version to `go1.22.5` (#16322)) - name: Set up python if: steps.skip-workflow.outputs.skip-workflow == 'false' && steps.changes.outputs.end_to_end == 'true'