Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DX-59038 flightsql release jobs failing #4

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ brew "boost"
brew "cmake"
brew "git"
brew "glog"
brew "[email protected]"
brew "ninja"
brew "[email protected]"
brew "wget"
brew "[email protected]"
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ if (NOT ODBCABSTRACTION_GIT_TAG)
if (DEFINED ENV{ODBCABSTRACTION_GIT_TAG})
set(ODBCABSTRACTION_GIT_TAG "$ENV{ODBCABSTRACTION_GIT_TAG}")
else()
set(ODBCABSTRACTION_GIT_TAG "156ac3d10703c00308ff707134d65b20dd362281")
set(ODBCABSTRACTION_GIT_TAG "d2a1029b0641febb0872831bec1b90fe3f635dd3")
endif()
endif()

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ RUN rm /usr/local/lib/libssl.a /usr/local/lib/libcrypto.a && \
ln -s /usr/lib64/libcrypto.a /usr/local/lib/libcrypto.a

RUN yum install -y wget && \
wget https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz && \
tar -xzf boost_1_76_0.tar.gz && \
cd boost_1_76_0 && \
wget https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz && \
tar -xzf boost_1_80_0.tar.gz && \
cd boost_1_80_0 && \
./bootstrap.sh --prefix=/opt/boost && \
./b2 install --prefix=/opt/boost --with=all || true

Expand Down
2 changes: 1 addition & 1 deletion build-debug.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd _build
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=/opt/flightsql-odbc}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=156ac3d10703c00308ff707134d65b20dd362281}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=d2a1029b0641febb0872831bec1b90fe3f635dd3}"

cmake \
-GNinja \
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cd _build
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=/opt/flightsql-odbc}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=156ac3d10703c00308ff707134d65b20dd362281}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=d2a1029b0641febb0872831bec1b90fe3f635dd3}"

cmake \
-GNinja \
Expand Down
2 changes: 1 addition & 1 deletion build_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cd build
ARROW_GIT_REPOSITORY="${ARROW_GIT_REPOSITORY:=https://github.com/apache/arrow}"
ARROW_GIT_TAG="${ARROW_GIT_TAG:=b050bd0d31db6412256cec3362c0d57c9732e1f2}"
ODBCABSTRACTION_REPO="${ODBCABSTRACTION_REPO:=../flightsql-odbc}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=156ac3d10703c00308ff707134d65b20dd362281}"
ODBCABSTRACTION_GIT_TAG="${ODBCABSTRACTION_GIT_TAG:=d2a1029b0641febb0872831bec1b90fe3f635dd3}"

cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion build_win32.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SETLOCAL
if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY="https://github.com/apache/arrow"
if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG="b050bd0d31db6412256cec3362c0d57c9732e1f2"
if NOT DEFINED ODBCABSTRACTION_REPO SET ODBCABSTRACTION_REPO="../flightsql-odbc"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="156ac3d10703c00308ff707134d65b20dd362281"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="d2a1029b0641febb0872831bec1b90fe3f635dd3"

cmake ..^
-DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^
Expand Down
2 changes: 1 addition & 1 deletion build_win64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SETLOCAL
if NOT DEFINED ARROW_GIT_REPOSITORY SET ARROW_GIT_REPOSITORY="https://github.com/apache/arrow"
if NOT DEFINED ARROW_GIT_TAG SET ARROW_GIT_TAG="b050bd0d31db6412256cec3362c0d57c9732e1f2"
if NOT DEFINED ODBCABSTRACTION_REPO SET ODBCABSTRACTION_REPO="../flightsql-odbc"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="156ac3d10703c00308ff707134d65b20dd362281"
if NOT DEFINED ODBCABSTRACTION_GIT_TAG SET ODBCABSTRACTION_GIT_TAG="d2a1029b0641febb0872831bec1b90fe3f635dd3"

cmake ..^
-DARROW_GIT_REPOSITORY=%ARROW_GIT_REPOSITORY%^
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
"zlib",
"zstd"
],
"builtin-baseline": "4e485c34f5e056327ef00c14e2e3620bc50de098"
"builtin-baseline": "94ce0dab56f4d8ba6bd631ba59ed682b02d45c46"
}