merge conflict fixes

Signed-off-by: Tim Vaillancourt <[email protected]>
slackhq · Jul 9, 2024 · f90a960 · f90a960
1 parent 99a019f
commit f90a960
Show file tree

Hide file tree

Showing 27 changed files with 0 additions and 160 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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://[email protected]/.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
@@ -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
@@ -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://[email protected]/.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
@@ -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
@@ -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://[email protected]/.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
@@ -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
@@ -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://[email protected]/.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
@@ -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
@@ -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
@@ -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
@@ -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://[email protected]/.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
@@ -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://[email protected]/.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'