From 4f58179d0e753f16357dcad232341f30e81743ca Mon Sep 17 00:00:00 2001 From: Matt Topol Date: Tue, 19 Mar 2024 17:00:26 -0400 Subject: [PATCH] ok, i think i found all the remaining spots --- .env | 2 +- .github/workflows/native-windows.yml | 6 +++--- .github/workflows/r-check.yml | 2 +- ci/linux-packages/apt/ubuntu-jammy/Dockerfile | 2 +- ci/linux-packages/debian/control | 2 +- ci/linux-packages/debian/rules | 2 +- dev/release/verify-release-candidate.sh | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 7d79041852..cb6cb8ec9f 100644 --- a/.env +++ b/.env @@ -32,7 +32,7 @@ JDK=8 MANYLINUX=2014 MAVEN=3.5.4 PYTHON=3.8 -GO=1.21 +GO=1.21.8 ARROW_MAJOR_VERSION=14 DOTNET=7.0 diff --git a/.github/workflows/native-windows.yml b/.github/workflows/native-windows.yml index 57ff371ae0..9420fec934 100644 --- a/.github/workflows/native-windows.yml +++ b/.github/workflows/native-windows.yml @@ -223,7 +223,7 @@ jobs: --file ci/conda_env_cpp.txt - uses: actions/setup-go@v5 with: - go-version: 1.20.8 + go-version: 1.21.8 check-latest: true cache: true cache-dependency-path: go/adbc/go.sum @@ -238,7 +238,7 @@ 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\1.21.8\x64\bin;" + $env:PATH .\ci\scripts\go_build.ps1 $pwd $pwd\build # TODO(apache/arrow#358): enable these tests on Windows # - name: Go Test @@ -246,7 +246,7 @@ 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\1.21.8\x64\bin;" + $env:PATH # .\ci\scripts\go_test.ps1 $pwd $pwd\build # ------------------------------------------------------------ diff --git a/.github/workflows/r-check.yml b/.github/workflows/r-check.yml index e29f7f3ed7..9a9df7801f 100644 --- a/.github/workflows/r-check.yml +++ b/.github/workflows/r-check.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - uses: r-lib/actions/setup-r@v2 with: r-version: release diff --git a/ci/linux-packages/apt/ubuntu-jammy/Dockerfile b/ci/linux-packages/apt/ubuntu-jammy/Dockerfile index bc5708e343..d839c12e7c 100644 --- a/ci/linux-packages/apt/ubuntu-jammy/Dockerfile +++ b/ci/linux-packages/apt/ubuntu-jammy/Dockerfile @@ -59,5 +59,5 @@ RUN \ tzdata \ valac && \ apt install -y -V -t $(lsb_release --codename --short)-backports ${quiet} \ - golang-1.20 && \ + golang-1.21 && \ apt clean diff --git a/ci/linux-packages/debian/control b/ci/linux-packages/debian/control index 88e490222f..970933c5d4 100644 --- a/ci/linux-packages/debian/control +++ b/ci/linux-packages/debian/control @@ -23,7 +23,7 @@ Build-Depends: cmake, debhelper-compat (= 12), gobject-introspection, - golang | golang-1.20, + golang | golang-1.21, libarrow-glib-dev, libgirepository1.0-dev, libpq-dev, diff --git a/ci/linux-packages/debian/rules b/ci/linux-packages/debian/rules index 2a766d5d4b..f931e51e0c 100755 --- a/ci/linux-packages/debian/rules +++ b/ci/linux-packages/debian/rules @@ -32,7 +32,7 @@ CMAKE_BUILD_TYPE = RelWithDebInfo override_dh_auto_configure: env \ - PATH=/usr/lib/go-1.20/bin:$${PATH} \ + PATH=/usr/lib/go-1.21/bin:$${PATH} \ dh_auto_configure \ --sourcedirectory=c/ \ --builddirectory=c.build \ diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh index fc0142ee21..2030744364 100755 --- a/dev/release/verify-release-candidate.sh +++ b/dev/release/verify-release-candidate.sh @@ -23,7 +23,7 @@ # - Maven >= 3.3.9 # - JDK >=7 # - gcc >= 4.8 -# - Go >= 1.20 +# - Go >= 1.21 # - Docker # # To reuse build artifacts between runs set ARROW_TMPDIR environment variable to @@ -413,7 +413,7 @@ test_cpp() { maybe_setup_conda \ --file ci/conda_env_cpp.txt \ compilers \ - go=1.20 || exit 1 + go=1.21 || exit 1 if [ "${USE_CONDA}" -gt 0 ]; then export CMAKE_PREFIX_PATH="${CONDA_BACKUP_CMAKE_PREFIX_PATH}:${CMAKE_PREFIX_PATH}" @@ -564,7 +564,7 @@ test_go() { # apache/arrow-adbc#517: `go build` calls git. Don't assume system # has git; even if it's there, go_build.sh sets DYLD_LIBRARY_PATH # which can interfere with system git. - maybe_setup_conda compilers git go=1.20 || exit 1 + maybe_setup_conda compilers git go=1.21 || exit 1 if [ "${USE_CONDA}" -gt 0 ]; then # The CMake setup forces RPATH to be the Conda prefix