Skip to content

Commit

Permalink
ok, i think i found all the remaining spots
Browse files Browse the repository at this point in the history
  • Loading branch information
zeroshade committed Mar 19, 2024
1 parent 4bb2a78 commit 4f58179
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/native-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -238,15 +238,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\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
# 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\1.21.8\x64\bin;" + $env:PATH
# .\ci\scripts\go_test.ps1 $pwd $pwd\build

# ------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/linux-packages/apt/ubuntu-jammy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ci/linux-packages/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion ci/linux-packages/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4f58179

Please sign in to comment.