From 08d44029a7ad04d5f9e4e680cf997f13e2ef9e0a Mon Sep 17 00:00:00 2001 From: Aaron Son Date: Thu, 5 Oct 2023 13:28:36 -0700 Subject: [PATCH] go/go.mod: Require Go 1.21 in our go.mod. --- .github/workflows/bump-dependency.yaml | 2 +- .github/workflows/cd-release.yaml | 2 +- .github/workflows/ci-bats-unix-remote.yaml | 2 +- .github/workflows/ci-bats-unix.yaml | 2 +- .github/workflows/ci-bats-windows.yaml | 2 +- .github/workflows/ci-check-repo.yaml | 6 +++--- .github/workflows/ci-compatibility-tests.yaml | 2 +- .github/workflows/ci-go-race-enginetests.yaml | 2 +- .github/workflows/ci-go-tests.yaml | 4 ++-- .github/workflows/ci-sql-server-integration-tests.yaml | 2 +- .github/workflows/import-perf.yaml | 2 +- .github/workflows/merge-perf.yaml | 2 +- .github/workflows/sysbench-perf.yaml | 2 +- go/go.mod | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/bump-dependency.yaml b/.github/workflows/bump-dependency.yaml index f0a741a9dc..22cb01809f 100644 --- a/.github/workflows/bump-dependency.yaml +++ b/.github/workflows/bump-dependency.yaml @@ -98,7 +98,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - name: Bump dependency working-directory: go run: | diff --git a/.github/workflows/cd-release.yaml b/.github/workflows/cd-release.yaml index be25183025..4f9cbc1c35 100644 --- a/.github/workflows/cd-release.yaml +++ b/.github/workflows/cd-release.yaml @@ -48,7 +48,7 @@ jobs: run: | latest=$(git rev-parse HEAD) echo "commitish=$latest" >> $GITHUB_OUTPUT - GO_BUILD_VERSION=1.19 go/utils/publishrelease/buildbinaries.sh + GO_BUILD_VERSION=1.21 go/utils/publishrelease/buildbinaries.sh - name: Create Release id: create_release uses: dolthub/create-release@v1 diff --git a/.github/workflows/ci-bats-unix-remote.yaml b/.github/workflows/ci-bats-unix-remote.yaml index 32c1998a82..ee8a98dc06 100644 --- a/.github/workflows/ci-bats-unix-remote.yaml +++ b/.github/workflows/ci-bats-unix-remote.yaml @@ -46,7 +46,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - name: Setup Python 3.x uses: actions/setup-python@v4 diff --git a/.github/workflows/ci-bats-unix.yaml b/.github/workflows/ci-bats-unix.yaml index acd588a9a8..126b40a18d 100644 --- a/.github/workflows/ci-bats-unix.yaml +++ b/.github/workflows/ci-bats-unix.yaml @@ -46,7 +46,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - name: Setup Python 3.x uses: actions/setup-python@v4 diff --git a/.github/workflows/ci-bats-windows.yaml b/.github/workflows/ci-bats-windows.yaml index ec043e9587..3e9218ba56 100644 --- a/.github/workflows/ci-bats-windows.yaml +++ b/.github/workflows/ci-bats-windows.yaml @@ -95,7 +95,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - name: Setup Python 3.x uses: actions/setup-python@v4 diff --git a/.github/workflows/ci-check-repo.yaml b/.github/workflows/ci-check-repo.yaml index 34e62a0329..ecb6a73c19 100644 --- a/.github/workflows/ci-check-repo.yaml +++ b/.github/workflows/ci-check-repo.yaml @@ -18,7 +18,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - uses: actions/checkout@v3 with: submodules: true @@ -69,7 +69,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - uses: actions/checkout@v3 with: ref: "main" @@ -98,7 +98,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.ref || github.ref }} diff --git a/.github/workflows/ci-compatibility-tests.yaml b/.github/workflows/ci-compatibility-tests.yaml index 0439107151..02e8c7e261 100644 --- a/.github/workflows/ci-compatibility-tests.yaml +++ b/.github/workflows/ci-compatibility-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/.github/workflows/ci-go-race-enginetests.yaml b/.github/workflows/ci-go-race-enginetests.yaml index 0a4bc5f871..cb201ec28f 100644 --- a/.github/workflows/ci-go-race-enginetests.yaml +++ b/.github/workflows/ci-go-race-enginetests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - uses: actions/checkout@v3 - name: Test All diff --git a/.github/workflows/ci-go-tests.yaml b/.github/workflows/ci-go-tests.yaml index 210a0b3ee0..ac8a7924d8 100644 --- a/.github/workflows/ci-go-tests.yaml +++ b/.github/workflows/ci-go-tests.yaml @@ -26,7 +26,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - uses: actions/checkout@v3 - name: Test All @@ -73,7 +73,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - uses: actions/checkout@v3 - name: Test All diff --git a/.github/workflows/ci-sql-server-integration-tests.yaml b/.github/workflows/ci-sql-server-integration-tests.yaml index 26152a32e0..6dc19a3517 100644 --- a/.github/workflows/ci-sql-server-integration-tests.yaml +++ b/.github/workflows/ci-sql-server-integration-tests.yaml @@ -26,7 +26,7 @@ jobs: - name: Setup Go 1.x uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 id: go - name: Create CI Bin run: | diff --git a/.github/workflows/import-perf.yaml b/.github/workflows/import-perf.yaml index e74bb75ecb..a6fe3894ef 100644 --- a/.github/workflows/import-perf.yaml +++ b/.github/workflows/import-perf.yaml @@ -20,7 +20,7 @@ jobs: id: go uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - name: Dolt version id: version diff --git a/.github/workflows/merge-perf.yaml b/.github/workflows/merge-perf.yaml index 0177b8e829..4cdd65b3e9 100644 --- a/.github/workflows/merge-perf.yaml +++ b/.github/workflows/merge-perf.yaml @@ -20,7 +20,7 @@ jobs: id: go uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - name: Setup Python 3.x uses: actions/setup-python@v4 diff --git a/.github/workflows/sysbench-perf.yaml b/.github/workflows/sysbench-perf.yaml index ab659ca1db..eab36efd18 100644 --- a/.github/workflows/sysbench-perf.yaml +++ b/.github/workflows/sysbench-perf.yaml @@ -20,7 +20,7 @@ jobs: id: go uses: actions/setup-go@v3 with: - go-version: ^1.19 + go-version: ^1.21 - name: Dolt version id: version diff --git a/go/go.mod b/go/go.mod index 736db802b1..a20ab0937b 100644 --- a/go/go.mod +++ b/go/go.mod @@ -160,4 +160,4 @@ require ( replace github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi => ./gen/proto/dolt/services/eventsapi -go 1.19 +go 1.21