Skip to content

Commit

Permalink
chore: revert R
Browse files Browse the repository at this point in the history
  • Loading branch information
lidavidm committed Aug 10, 2023
1 parent 53eb3f9 commit d7e7db3
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
--file ci/conda_env_python.txt
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: go/adbc/go.sum
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
--file ci/conda_env_python.txt
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: go/adbc/go.sum
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/native-unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
--file ci/conda_env_cpp.txt
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: go/adbc/go.sum
Expand All @@ -112,14 +112,14 @@ jobs:
export ADBC_BUILD_TESTS=OFF
export ADBC_USE_ASAN=OFF
export ADBC_USE_UBSAN=OFF
export PATH=$RUNNER_TOOL_CACHE/go/1.20.7/x64/bin:$PATH
export PATH=$RUNNER_TOOL_CACHE/go/1.18.10/x64/bin:$PATH
./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.20.7/x64/bin:$PATH
export PATH=$RUNNER_TOOL_CACHE/go/1.18.10/x64/bin:$PATH
./ci/scripts/go_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
persist-credentials: false
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: go/adbc/go.sum
Expand Down Expand Up @@ -361,7 +361,7 @@ jobs:
--file ci/conda_env_cpp.txt
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: go/adbc/go.sum
Expand All @@ -378,7 +378,7 @@ jobs:
- name: Go Build
shell: bash -l {0}
run: |
export PATH=$RUNNER_TOOL_CACHE/go/1.20.7/x64/bin:$PATH
export PATH=$RUNNER_TOOL_CACHE/go/1.18.10/x64/bin:$PATH
./ci/scripts/go_build.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
- name: Run Staticcheck
if: ${{ !contains('macos-latest', matrix.os) }}
Expand All @@ -392,7 +392,7 @@ jobs:
env:
SNOWFLAKE_URI: ${{ secrets.SNOWFLAKE_URI }}
run: |
export PATH=$RUNNER_TOOL_CACHE/go/1.20.7/x64/bin:$PATH
export PATH=$RUNNER_TOOL_CACHE/go/1.18.10/x64/bin:$PATH
./ci/scripts/go_test.sh "$(pwd)" "$(pwd)/build" "$HOME/local"
# ------------------------------------------------------------
Expand Down Expand Up @@ -441,7 +441,7 @@ jobs:
--file ci/conda_env_python.txt
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: go/adbc/go.sum
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@v3
with:
go-version: 1.20.7
go-version: 1.18.10
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.7\x64\bin;" + $env:PATH
$env:PATH="$($env:RUNNER_TOOL_CACHE)\go\1.18.10\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.7\x64\bin;" + $env:PATH
# $env:PATH="$($env:RUNNER_TOOL_CACHE)\go\1.18.10\x64\bin;" + $env:PATH
# .\ci\scripts\go_test.ps1 $pwd $pwd\build

# ------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ jobs:
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: adbc/go/adbc/go.sum
Expand Down Expand Up @@ -727,7 +727,7 @@ jobs:
- uses: actions/setup-go@v3
with:
go-version: 1.20.7
go-version: 1.18.10
check-latest: true
cache: true
cache-dependency-path: adbc/go/adbc/go.sum
Expand Down
4 changes: 2 additions & 2 deletions ci/docker/python-wheel-manylinux.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ ARG ARCH

RUN yum install -y docker
# arm64v8 -> arm64
RUN wget --no-verbose https://go.dev/dl/go1.20.7.linux-${ARCH/v8/}.tar.gz
RUN tar -C /usr/local -xzf go1.20.7.linux-${ARCH/v8/}.tar.gz
RUN wget --no-verbose https://go.dev/dl/go1.18.10.linux-${ARCH/v8/}.tar.gz
RUN tar -C /usr/local -xzf go1.18.10.linux-${ARCH/v8/}.tar.gz
ENV PATH="${PATH}:/usr/local/go/bin"
2 changes: 1 addition & 1 deletion dev/release/verify-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ install_go() {
return 0
fi

local version=1.20.7
local version=1.18.10
show_info "Installing go version ${version}..."

local arch="$(uname -m)"
Expand Down
2 changes: 1 addition & 1 deletion r/adbcflightsql/tools/download-go.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

tmp_dir <- "src/go/tmp"

go_version <- Sys.getenv("R_ADBC_GO_VERSION_DOWNLOAD", "1.20.7")
go_version <- Sys.getenv("R_ADBC_GO_VERSION_DOWNLOAD", "1.18.10")

go_platform <- tolower(Sys.info()[["sysname"]])
if (!(go_platform %in% c("darwin", "linux", "windows"))) {
Expand Down
2 changes: 1 addition & 1 deletion r/adbcsnowflake/tools/download-go.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

tmp_dir <- "src/go/tmp"

go_version <- Sys.getenv("R_ADBC_GO_VERSION_DOWNLOAD", "1.20.7")
go_version <- Sys.getenv("R_ADBC_GO_VERSION_DOWNLOAD", "1.18.10")

go_platform <- tolower(Sys.info()[["sysname"]])
if (!(go_platform %in% c("darwin", "linux", "windows"))) {
Expand Down

0 comments on commit d7e7db3

Please sign in to comment.