chore(go/adbc): bump minimum version to go1.21, update deps (apache#1646

) Bumping the minimum go version (via go.mod) to go1.21 and updated appropriate indirect dependencies accordingly. --------- Co-authored-by: Sutou Kouhei <[email protected]>
soumyadsanyal · Mar 27, 2024 · 56498a0 · 56498a0
1 parent 6f1a381
commit 56498a0
Show file tree

Hide file tree

Showing 39 changed files with 212 additions and 179 deletions.
diff --git a/.env b/.env
@@ -32,7 +32,7 @@ JDK=8
 MANYLINUX=2014
 MAVEN=3.6.3
 PYTHON=3.8
-GO=1.19.5
+GO=1.21.8
 ARROW_MAJOR_VERSION=14
 DOTNET=7.0
 

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -110,6 +110,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - name: Get Date
         id: get-date
         shell: bash
@@ -135,7 +138,7 @@ jobs:
           pip install pytest-error-for-skips
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.13
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum
@@ -305,6 +308,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - name: Get Date
         id: get-date
         shell: bash
@@ -333,7 +339,7 @@ jobs:
           sudo sysctl vm.mmap_rnd_bits=28
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.13
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum

diff --git a/.github/workflows/native-unix.yml b/.github/workflows/native-unix.yml
@@ -80,6 +80,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - name: Get Date
         id: get-date
         shell: bash
@@ -103,7 +106,7 @@ jobs:
             --file ci/conda_env_cpp.txt
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.13
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum
@@ -117,15 +120,15 @@ jobs:
           export ADBC_BUILD_TESTS=OFF
           export ADBC_USE_ASAN=OFF
           export ADBC_USE_UBSAN=OFF
-          export PATH=$RUNNER_TOOL_CACHE/go/1.19.13/${{ matrix.goarch }}/bin:$PATH
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/${{ matrix.goarch }}/bin:$PATH
           export ADBC_CMAKE_ARGS="-DCMAKE_UNITY_BUILD=ON"
           ./ci/scripts/cpp_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
       - name: Go Build
         shell: bash -l {0}
         env:
           CGO_ENABLED: "1"
         run: |
-          export PATH=$RUNNER_TOOL_CACHE/go/1.19.13/${{ matrix.goarch }}/bin:$PATH
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/${{ matrix.goarch }}/bin:$PATH
           ./ci/scripts/go_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
 
       - uses: actions/upload-artifact@v3
@@ -332,7 +335,7 @@ jobs:
           sudo sysctl vm.mmap_rnd_bits=28
 
       - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
       - name: Go Build
         run: |
           ./ci/scripts/go_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
@@ -370,6 +373,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - name: Get Date
         id: get-date
         shell: bash
@@ -399,14 +405,14 @@ jobs:
             --file ci/conda_env_cpp.txt
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.13
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum
       - name: Install staticcheck
         shell: bash -l {0}
         if: matrix.os == 'ubuntu-latest'
-        run: go install honnef.co/go/tools/cmd/staticcheck@v0.3.3
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
 
       - uses: actions/download-artifact@v3
         with:
@@ -416,7 +422,7 @@ jobs:
       - name: Go Build
         shell: bash -l {0}
         run: |
-          export PATH=$RUNNER_TOOL_CACHE/go/1.19.13/${{ matrix.goarch }}/bin:$PATH
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/${{ matrix.goarch }}/bin:$PATH
           ./ci/scripts/go_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
       - name: Run Staticcheck
         if: matrix.os == 'ubuntu-latest'
@@ -430,7 +436,7 @@ jobs:
         env:
           SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}
         run: |
-          export PATH=$RUNNER_TOOL_CACHE/go/1.19.13/${{ matrix.goarch }}/bin:$PATH
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/${{ matrix.goarch }}/bin:$PATH
           ./ci/scripts/go_test.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
 
   # ------------------------------------------------------------
@@ -454,6 +460,9 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - name: Get Date
         id: get-date
         shell: bash
@@ -484,7 +493,7 @@ jobs:
           sudo sysctl vm.mmap_rnd_bits=28
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.13
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum
@@ -501,10 +510,12 @@ jobs:
           ADBC_USE_ASAN: "0"
           ADBC_USE_UBSAN: "0"
         run: |
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/x64/bin:$PATH
           ./ci/scripts/python_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
       - name: Build Panic Dummy
         shell: bash -l {0}
         run: |
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/x64/bin:$PATH
           if [[ $(uname) = "Darwin" ]]; then
             make -C ./go/adbc/pkg libadbc_driver_panicdummy.dylib
           else
@@ -518,10 +529,12 @@ jobs:
           else
             export PANICDUMMY_LIBRARY_PATH=$(pwd)/go/adbc/pkg/libadbc_driver_panicdummy.so
           fi
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/x64/bin:$PATH
           env BUILD_ALL=0 BUILD_DRIVER_MANAGER=1 ./ci/scripts/python_test.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
       - name: Test Python Driver Flight SQL
         shell: bash -l {0}
         run: |
+          export PATH=$RUNNER_TOOL_CACHE/go/${GO_VERSION}/x64/bin:$PATH
           # Can't use Docker on macOS
           pushd $(pwd)/go/adbc
           go build -o testserver ./driver/flightsql/cmd/testserver

diff --git a/.github/workflows/native-windows.yml b/.github/workflows/native-windows.yml
@@ -198,6 +198,10 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
+      - name: Get required Go version
+        shell: bash
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - name: Get Date
         id: get-date
         shell: bash
@@ -223,7 +227,7 @@ jobs:
             --file ci/conda_env_cpp.txt
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.8
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: go/adbc/go.sum
@@ -238,15 +242,15 @@ jobs:
         env:
           CGO_ENABLED: "1"
         run: |
-          $env:PATH="$($env:RUNNER_TOOL_CACHE)\go\1.20.8\x64\bin;" + $env:PATH
+          $env:PATH="${env:RUNNER_TOOL_CACHE}\go\${env:GO_VERSION}\x64\bin;${env:PATH}"
           .\ci\scripts\go_build.ps1 $pwd $pwd\build
       # TODO(apache/arrow#358): enable these tests on Windows
       # - name: Go Test
       #   shell: pwsh
       #   env:
       #     CGO_ENABLED: "1"
       #   run: |
-      #     $env:PATH="$($env:RUNNER_TOOL_CACHE)\go\1.20.8\x64\bin;" + $env:PATH
+      #     $env:PATH="${env:RUNNER_TOOL_CACHE}\go\${env:GO_VERSION}\x64\bin;${env:PATH}"
       #     .\ci\scripts\go_test.ps1 $pwd $pwd\build
 
   # ------------------------------------------------------------

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -265,7 +265,6 @@ jobs:
           - almalinux-8
           - almalinux-9
           - debian-bookworm
-          - debian-bullseye
           - ubuntu-jammy
     steps:
       - uses: actions/download-artifact@v3
@@ -686,7 +685,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19.13
+          go-version: 1.21.8
           check-latest: true
           cache: true
           cache-dependency-path: adbc/go/adbc/go.sum
@@ -812,6 +811,8 @@ jobs:
           tar xf apache-arrow-adbc-${VERSION}.tar.gz
           mv apache-arrow-adbc-${VERSION} adbc
 
+          (. adbc/.env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
+
       - name: Show inputs
         shell: pwsh
         run: |
@@ -841,11 +842,9 @@ jobs:
           .\bootstrap-vcpkg.bat -disableMetrics
           popd
 
-      # Windows needs newer Go than 1.19
-      # https://github.com/golang/go/issues/51007
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.20.8
+          go-version: "${{ env.GO_VERSION }}"
           check-latest: true
           cache: true
           cache-dependency-path: adbc/go/adbc/go.sum

diff --git a/.github/workflows/r-check.yml b/.github/workflows/r-check.yml
@@ -41,9 +41,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Get required Go version
+        run: |
+          (. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: "${{ env.GO_VERSION }}"
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: release

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -59,7 +59,7 @@ repos:
         - "--linelength=90"
         - "--verbose=2"
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.49.0
+    rev: v1.57.1
     hooks:
     - id: golangci-lint
       entry: bash -c 'cd go/adbc && golangci-lint run --fix --timeout 5m'

diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -63,7 +63,7 @@ outputs:
         - {{ compiler('cxx') }}
         - _go_select *=cgo
         - cmake
-        - go-cgo >=1.19
+        - go-cgo >=1.21
         - ninja
         - pkg-config
     test:

diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile
@@ -24,9 +24,11 @@ ARG VCPKG
 FROM ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-${MANYLINUX}-vcpkg-${VCPKG}
 
 ARG ARCH
+ARG GO
 
 RUN yum install -y docker
 # arm64v8 -> arm64
-RUN wget --no-verbose https://go.dev/dl/go1.19.13.linux-${ARCH/v8/}.tar.gz
-RUN tar -C /usr/local -xzf go1.19.13.linux-${ARCH/v8/}.tar.gz
-ENV PATH="${PATH}:/usr/local/go/bin"
+RUN wget --no-verbose https://go.dev/dl/go${GO}.linux-${ARCH/v8/}.tar.gz && \
+    tar -C /usr/local -xzf go${GO}.linux-${ARCH/v8/}.tar.gz && \
+    rm go${GO}.linux-${ARCH/v8/}.tar.gz
+ENV PATH="/usr/local/go/bin:${PATH}"
diff --git a/ci/linux-packages/Rakefile b/ci/linux-packages/Rakefile
@@ -104,10 +104,19 @@ class ADBCPackageTask < PackageTask
     end
   end
 
+  def detect_go_version
+    dot_env = File.join(__dir__, "..", "..", ".env")
+    File.readlines(dot_env, chomp: true).grep(/\AGO=/)[0].split("=", 2)[1]
+  end
+
+  def docker_build_options(os, architecture)
+    [
+      "--build-arg", "GO_VERSION=#{detect_go_version}",
+    ]
+  end
+
   def apt_targets_default
     [
-      "debian-bullseye",
-      # "debian-bullseye-arm64",
       "debian-bookworm",
       # "debian-bookworm-arm64",
       "ubuntu-jammy",

diff --git a/ci/linux-packages/apt/debian-bookworm/Dockerfile b/ci/linux-packages/apt/debian-bookworm/Dockerfile
@@ -40,6 +40,7 @@ RUN \
   apt install -y -V ${quiet} \
     ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
   rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+  echo "deb http://deb.debian.org/debian $(lsb_release --codename --short)-backports main" >> /etc/apt/sources.list && \
   apt update && \
   apt install -y -V ${quiet} \
     build-essential \
@@ -48,7 +49,6 @@ RUN \
     debhelper \
     devscripts \
     gobject-introspection \
-    golang \
     libarrow-glib-dev \
     libgirepository1.0-dev \
     libpq-dev \
@@ -58,4 +58,5 @@ RUN \
     pkg-config \
     tzdata \
     valac && \
+  apt install -y -V -t $(lsb_release --codename --short)-backports ${quiet} golang-1.21 && \
   apt clean