From c01241f89a9dafdf589f6c4ce4f052ba1c953494 Mon Sep 17 00:00:00 2001 From: Steve Lord Date: Thu, 10 Nov 2022 16:18:07 -0800 Subject: [PATCH 1/5] DX-59038 flightsql release jobs failing Update to latest tagged version of vcpkg Change-Id: Iea254b5f3cb257cc3e805f4086e619fd36d225d5 --- CMakeLists.txt | 2 +- Dockerfile | 6 +++--- build-debug.sh | 2 +- build.sh | 2 +- build_osx.sh | 2 +- build_win32.bat | 2 +- build_win64.bat | 2 +- vcpkg.json | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f18c8df..1cf40cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/Dockerfile b/Dockerfile index 6d5be5b5..c31100df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/build-debug.sh b/build-debug.sh index 6b46dfac..e186e698 100755 --- a/build-debug.sh +++ b/build-debug.sh @@ -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 \ diff --git a/build.sh b/build.sh index b108f9dd..b734ccaa 100755 --- a/build.sh +++ b/build.sh @@ -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 \ diff --git a/build_osx.sh b/build_osx.sh index e19f3e6d..da161a60 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -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 \ diff --git a/build_win32.bat b/build_win32.bat index 6b3e4cf4..822a7379 100644 --- a/build_win32.bat +++ b/build_win32.bat @@ -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%^ diff --git a/build_win64.bat b/build_win64.bat index b2a61d23..e5263609 100644 --- a/build_win64.bat +++ b/build_win64.bat @@ -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%^ diff --git a/vcpkg.json b/vcpkg.json index 8d91eb85..42517ed9 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -26,5 +26,5 @@ "zlib", "zstd" ], - "builtin-baseline": "4e485c34f5e056327ef00c14e2e3620bc50de098" + "builtin-baseline": "94ce0dab56f4d8ba6bd631ba59ed682b02d45c46" } From 2ccab70751e274d78aa93cb9a6be6e5a29380a94 Mon Sep 17 00:00:00 2001 From: Steve Lord Date: Thu, 19 Jan 2023 08:47:46 -0800 Subject: [PATCH 2/5] DX-59038 flightsql release jobs failing Update to latest tagged version of vcpkg Change-Id: Iea254b5f3cb257cc3e805f4086e619fd36d225d5 --- build_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_osx.sh b/build_osx.sh index da161a60..2e35c29a 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -9,7 +9,7 @@ set -e -vcpkg/vcpkg install --triplet x64-osx --x-install-root=vcpkg/installed +./vcpkg/vcpkg install --triplet x64-osx --x-install-root=vcpkg/installed mkdir -p build cd build From fabf89bd78e3c87fd6f26e153d98f5216096b2b9 Mon Sep 17 00:00:00 2001 From: Steve Lord Date: Thu, 19 Jan 2023 15:45:26 -0800 Subject: [PATCH 3/5] DX-59038 flightsql release jobs failing --- build_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_osx.sh b/build_osx.sh index 2e35c29a..da161a60 100755 --- a/build_osx.sh +++ b/build_osx.sh @@ -9,7 +9,7 @@ set -e -./vcpkg/vcpkg install --triplet x64-osx --x-install-root=vcpkg/installed +vcpkg/vcpkg install --triplet x64-osx --x-install-root=vcpkg/installed mkdir -p build cd build From 8e9fe95b6dfc9e0e3b71fb4d45b18368dd58a19a Mon Sep 17 00:00:00 2001 From: Steve Lord Date: Fri, 20 Jan 2023 11:22:03 -0800 Subject: [PATCH 4/5] DX-59038 flightsql release jobs failing Add pkg-config to be installed by Brew --- Brewfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Brewfile b/Brewfile index 7372c258..d5add964 100644 --- a/Brewfile +++ b/Brewfile @@ -8,7 +8,8 @@ brew "boost" brew "cmake" brew "git" brew "glog" +brew "libiodbc@3.52.15" brew "ninja" brew "openssl@1.1" +brew "pkg-config" brew "wget" -brew "libiodbc@3.52.15" From f51fd8f7b24cb88ff333b16090c8ac545a750c9e Mon Sep 17 00:00:00 2001 From: Steve Lord Date: Fri, 20 Jan 2023 16:05:40 -0800 Subject: [PATCH 5/5] DX-59038 flightsql release jobs failing --- Brewfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Brewfile b/Brewfile index d5add964..03bd8ad0 100644 --- a/Brewfile +++ b/Brewfile @@ -11,5 +11,4 @@ brew "glog" brew "libiodbc@3.52.15" brew "ninja" brew "openssl@1.1" -brew "pkg-config" brew "wget"