From 7c710dd211f3f8a36c83e29e51ee6ac92f53be93 Mon Sep 17 00:00:00 2001 From: coffeegoddd Date: Wed, 27 Mar 2024 14:02:28 -0700 Subject: [PATCH 1/3] /{.github,go,integration-tests}: bump go version --- .github/workflows/cd-release-pgo.yaml | 4 ++-- go/go.mod | 2 +- go/performance/continuous_integration/SysbenchDockerfile | 2 +- integration-tests/DataDumpLoadDockerfile | 2 +- integration-tests/MySQLDockerfile | 2 +- integration-tests/ORMDockerfile | 2 +- integration-tests/go-sql-server-driver/go.mod | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd-release-pgo.yaml b/.github/workflows/cd-release-pgo.yaml index 98c018e41e..b4c07b007d 100644 --- a/.github/workflows/cd-release-pgo.yaml +++ b/.github/workflows/cd-release-pgo.yaml @@ -83,9 +83,9 @@ jobs: run: | latest=$(git rev-parse HEAD) echo "commitish=$latest" >> $GITHUB_OUTPUT - GO_BUILD_VERSION=1.21 go/utils/publishrelease/buildpgobinaries.sh + GO_BUILD_VERSION=1.22 go/utils/publishrelease/buildpgobinaries.sh env: - GO_BUILD_VERSION: "1.21" + GO_BUILD_VERSION: "1.22" PROFILE: ${{ format('{0}/dolt-cpu-profile.pprof', github.workspace) }} - name: Create Release id: create_release diff --git a/go/go.mod b/go/go.mod index 8a753f4eca..ca0784c7c8 100644 --- a/go/go.mod +++ b/go/go.mod @@ -166,4 +166,4 @@ require ( replace github.com/dolthub/dolt/go/gen/proto/dolt/services/eventsapi => ./gen/proto/dolt/services/eventsapi -go 1.21 +go 1.22 diff --git a/go/performance/continuous_integration/SysbenchDockerfile b/go/performance/continuous_integration/SysbenchDockerfile index 424fdd66ae..21a0b69f66 100644 --- a/go/performance/continuous_integration/SysbenchDockerfile +++ b/go/performance/continuous_integration/SysbenchDockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 golang:1.21-alpine as gobin +FROM --platform=linux/amd64 golang:1.22-alpine as gobin FROM --platform=linux/amd64 ubuntu:22.04 COPY --from=gobin /usr/local/go/ /go/ diff --git a/integration-tests/DataDumpLoadDockerfile b/integration-tests/DataDumpLoadDockerfile index a27019ac82..cf8fea93ee 100644 --- a/integration-tests/DataDumpLoadDockerfile +++ b/integration-tests/DataDumpLoadDockerfile @@ -19,7 +19,7 @@ RUN apt update -y && \ # install go WORKDIR /root -ENV GO_VERSION=1.21.2 +ENV GO_VERSION=1.22 ENV GOPATH=$HOME/go ENV PATH=$PATH:$GOPATH/bin ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin diff --git a/integration-tests/MySQLDockerfile b/integration-tests/MySQLDockerfile index d458fef194..0dbb4b0efe 100644 --- a/integration-tests/MySQLDockerfile +++ b/integration-tests/MySQLDockerfile @@ -59,7 +59,7 @@ RUN apt update -y && \ # install go WORKDIR /root -ENV GO_VERSION=1.21.2 +ENV GO_VERSION=1.22 ENV GOPATH=$HOME/go ENV PATH=$PATH:$GOPATH/bin ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin diff --git a/integration-tests/ORMDockerfile b/integration-tests/ORMDockerfile index b2a865f595..d30dfd6eca 100644 --- a/integration-tests/ORMDockerfile +++ b/integration-tests/ORMDockerfile @@ -25,7 +25,7 @@ RUN apt update -y && \ # install go WORKDIR /root -ENV GO_VERSION=1.21.2 +ENV GO_VERSION=1.22 ENV GOPATH=$HOME/go ENV PATH=$PATH:$GOPATH/bin ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin diff --git a/integration-tests/go-sql-server-driver/go.mod b/integration-tests/go-sql-server-driver/go.mod index 52b3f94a27..3a58260a45 100644 --- a/integration-tests/go-sql-server-driver/go.mod +++ b/integration-tests/go-sql-server-driver/go.mod @@ -1,6 +1,6 @@ module github.com/dolthub/dolt/integration-tests/go-sql-server-driver -go 1.21 +go 1.22 require ( github.com/dolthub/dolt/go v0.40.4 From e8e5112fbe9d7dfbaa530cefc928d1406990c01e Mon Sep 17 00:00:00 2001 From: coffeegoddd Date: Wed, 27 Mar 2024 14:07:35 -0700 Subject: [PATCH 2/3] /integration-tests: fix go version --- integration-tests/DataDumpLoadDockerfile | 2 +- integration-tests/MySQLDockerfile | 2 +- integration-tests/ORMDockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/DataDumpLoadDockerfile b/integration-tests/DataDumpLoadDockerfile index cf8fea93ee..051cdc5ea1 100644 --- a/integration-tests/DataDumpLoadDockerfile +++ b/integration-tests/DataDumpLoadDockerfile @@ -19,7 +19,7 @@ RUN apt update -y && \ # install go WORKDIR /root -ENV GO_VERSION=1.22 +ENV GO_VERSION=1.22.1 ENV GOPATH=$HOME/go ENV PATH=$PATH:$GOPATH/bin ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin diff --git a/integration-tests/MySQLDockerfile b/integration-tests/MySQLDockerfile index 0dbb4b0efe..ffab658fc0 100644 --- a/integration-tests/MySQLDockerfile +++ b/integration-tests/MySQLDockerfile @@ -59,7 +59,7 @@ RUN apt update -y && \ # install go WORKDIR /root -ENV GO_VERSION=1.22 +ENV GO_VERSION=1.22.1 ENV GOPATH=$HOME/go ENV PATH=$PATH:$GOPATH/bin ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin diff --git a/integration-tests/ORMDockerfile b/integration-tests/ORMDockerfile index d30dfd6eca..ba0851db30 100644 --- a/integration-tests/ORMDockerfile +++ b/integration-tests/ORMDockerfile @@ -25,7 +25,7 @@ RUN apt update -y && \ # install go WORKDIR /root -ENV GO_VERSION=1.22 +ENV GO_VERSION=1.22.1 ENV GOPATH=$HOME/go ENV PATH=$PATH:$GOPATH/bin ENV PATH=$PATH:$GOPATH/bin:/usr/local/go/bin From 680af8d429f53a9dc087986e870ba7f04266fbdf Mon Sep 17 00:00:00 2001 From: coffeegoddd Date: Wed, 27 Mar 2024 16:19:00 -0700 Subject: [PATCH 3/3] /.github/workflows: remove check-latest option --- .github/workflows/bump-dependency.yaml | 1 - .github/workflows/cd-release-pgo.yaml | 1 - .github/workflows/ci-bats-macos.yaml | 1 - .github/workflows/ci-bats-unix-remote.yaml | 1 - .github/workflows/ci-bats-unix.yaml | 1 - .github/workflows/ci-bats-windows.yaml | 1 - .github/workflows/ci-check-repo.yaml | 3 --- .github/workflows/ci-compatibility-tests.yaml | 1 - .github/workflows/ci-go-race-tests.yaml | 1 - .github/workflows/ci-go-tests.yaml | 2 -- .github/workflows/ci-lambdabats-unix.yaml | 1 - .github/workflows/ci-sql-server-integration-tests.yaml | 1 - .github/workflows/import-perf.yaml | 1 - .github/workflows/merge-perf.yaml | 1 - .github/workflows/sysbench-perf.yaml | 1 - 15 files changed, 18 deletions(-) diff --git a/.github/workflows/bump-dependency.yaml b/.github/workflows/bump-dependency.yaml index 8570f2cff6..b6020b1d0b 100644 --- a/.github/workflows/bump-dependency.yaml +++ b/.github/workflows/bump-dependency.yaml @@ -99,7 +99,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Bump dependency working-directory: go run: | diff --git a/.github/workflows/cd-release-pgo.yaml b/.github/workflows/cd-release-pgo.yaml index b4c07b007d..0af8b12ca8 100644 --- a/.github/workflows/cd-release-pgo.yaml +++ b/.github/workflows/cd-release-pgo.yaml @@ -44,7 +44,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v2.2.0 with: diff --git a/.github/workflows/ci-bats-macos.yaml b/.github/workflows/ci-bats-macos.yaml index f12024e464..80d35b86f2 100644 --- a/.github/workflows/ci-bats-macos.yaml +++ b/.github/workflows/ci-bats-macos.yaml @@ -44,7 +44,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - name: Setup Python 3.x uses: actions/setup-python@v4 diff --git a/.github/workflows/ci-bats-unix-remote.yaml b/.github/workflows/ci-bats-unix-remote.yaml index fd7425d74c..dbd5e92361 100644 --- a/.github/workflows/ci-bats-unix-remote.yaml +++ b/.github/workflows/ci-bats-unix-remote.yaml @@ -31,7 +31,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - name: Setup Python 3.x if: ${{ env.use_credentials != 'true' }} diff --git a/.github/workflows/ci-bats-unix.yaml b/.github/workflows/ci-bats-unix.yaml index 2c3862b328..2cf117e009 100644 --- a/.github/workflows/ci-bats-unix.yaml +++ b/.github/workflows/ci-bats-unix.yaml @@ -52,7 +52,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true 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 1c8dfaa7f9..0ebd9aab01 100644 --- a/.github/workflows/ci-bats-windows.yaml +++ b/.github/workflows/ci-bats-windows.yaml @@ -100,7 +100,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true 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 08e2074e5b..2b848fd0b7 100644 --- a/.github/workflows/ci-check-repo.yaml +++ b/.github/workflows/ci-check-repo.yaml @@ -22,7 +22,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Check all id: should_format working-directory: ./go @@ -76,7 +75,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Copy script working-directory: ./go/utils/repofmt run: cp format_repo.sh _format_repo.sh @@ -107,7 +105,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Run go mod tidy run: go mod tidy working-directory: ./go diff --git a/.github/workflows/ci-compatibility-tests.yaml b/.github/workflows/ci-compatibility-tests.yaml index dc6f0cf110..ba4a238052 100644 --- a/.github/workflows/ci-compatibility-tests.yaml +++ b/.github/workflows/ci-compatibility-tests.yaml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/ci-go-race-tests.yaml b/.github/workflows/ci-go-race-tests.yaml index 061e521c11..3932affbc1 100644 --- a/.github/workflows/ci-go-race-tests.yaml +++ b/.github/workflows/ci-go-race-tests.yaml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - name: Test engine working-directory: ./go diff --git a/.github/workflows/ci-go-tests.yaml b/.github/workflows/ci-go-tests.yaml index 05441597c6..a60584ea9e 100644 --- a/.github/workflows/ci-go-tests.yaml +++ b/.github/workflows/ci-go-tests.yaml @@ -28,7 +28,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - name: Test All working-directory: ./go @@ -76,7 +75,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - name: Test All working-directory: ./go diff --git a/.github/workflows/ci-lambdabats-unix.yaml b/.github/workflows/ci-lambdabats-unix.yaml index e3b7819eac..0226aed099 100644 --- a/.github/workflows/ci-lambdabats-unix.yaml +++ b/.github/workflows/ci-lambdabats-unix.yaml @@ -47,7 +47,6 @@ jobs: if: ${{ env.use_credentials == 'true' }} with: go-version-file: go/go.mod - check-latest: true id: go - name: install lambdabats if: ${{ env.use_credentials == 'true' }} diff --git a/.github/workflows/ci-sql-server-integration-tests.yaml b/.github/workflows/ci-sql-server-integration-tests.yaml index fd95aa6972..971dbf1efa 100644 --- a/.github/workflows/ci-sql-server-integration-tests.yaml +++ b/.github/workflows/ci-sql-server-integration-tests.yaml @@ -28,7 +28,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true id: go - name: Create CI Bin run: | diff --git a/.github/workflows/import-perf.yaml b/.github/workflows/import-perf.yaml index f18374ab45..ea9a1929ef 100644 --- a/.github/workflows/import-perf.yaml +++ b/.github/workflows/import-perf.yaml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Dolt version id: version diff --git a/.github/workflows/merge-perf.yaml b/.github/workflows/merge-perf.yaml index 1897fe7633..56bc83db6d 100644 --- a/.github/workflows/merge-perf.yaml +++ b/.github/workflows/merge-perf.yaml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - 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 0a36781312..17322fc5aa 100644 --- a/.github/workflows/sysbench-perf.yaml +++ b/.github/workflows/sysbench-perf.yaml @@ -25,7 +25,6 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go/go.mod - check-latest: true - name: Dolt version id: version