Skip to content

Commit 9d24056

Browse files
sumeetchhetrisumeetchhetri
committed
Upgrade unixodbc version to 2.3.12
Disable tests and examples in mongo build [docker_verify]
1 parent ebe0d82 commit 9d24056

33 files changed

+53
-47
lines changed

‎.github/workflows/ci-macos.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,14 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
#brew unlink bazel
26-
brew install libpq openssl ossp-uuid unixodbc libmemcached boost jsoncpp apr apr-util pkgconfig httpd ninja mongo-c-driver
26+
brew install ossp-uuid libmemcached boost jsoncpp apr apr-util httpd ninja mongo-c-driver
27+
pushd /tmp
28+
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
29+
tar zxf unixODBC-2.3.12.tar.gz
30+
cd unixODBC-2.3.12
31+
./configure && make && make install
32+
cd /tmp
33+
rm -rf unixODBC-2.3.12
2734
#if [ -f /usr/local/lib/libssl.dylib ]; then
2835
# sudo mv /usr/local/lib/libssl.dylib /usr/local/lib/libssl_bak.dylib
2936
#fi
@@ -42,7 +49,6 @@ jobs:
4249
#if [ -d /usr/local/Cellar/openssl@1.1/1.1.1g/include ]; then
4350
# sudo ln -s /usr/local/Cellar/openssl@1.1/1.1.1g/include /usr/local/include/openssl
4451
#fi
45-
pushd /tmp
4652
wget -q https://github.com/efficient/libcuckoo/archive/master.zip
4753
unzip master.zip
4854
rm -f master.zip

‎.github/workflows/ci-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
rm -f "mongo-c-driver-$VERSION.tar.gz"
4747
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
4848
-D ENABLE_EXTRA_ALIGNMENT=OFF \
49-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
49+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
5050
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
5151
-D BUILD_VERSION="$VERSION" \
5252
-D ENABLE_SSL=OFF \

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
rm -f "mongo-c-driver-$VERSION.tar.gz"
8787
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
8888
-D ENABLE_EXTRA_ALIGNMENT=OFF \
89-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
89+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
9090
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
9191
-D BUILD_VERSION="$VERSION" \
9292
-D ENABLE_SSL=OFF \

‎docker/DockerFile-cross-archlinux-mingw64

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ RUN pacman -S --noconfirm --noprogressbar gcc gcc-libs glibc libtool mingw-w64-g
2424
ENV TARGET=x86_64-w64-mingw32
2525

2626
WORKDIR /tmp
27-
RUN wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.7.tar.gz
28-
RUN tar zxvf unixODBC-2.3.7.tar.gz
29-
RUN rm -f unixODBC-2.3.7.tar.gz
30-
WORKDIR unixODBC-2.3.7
27+
RUN wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
28+
RUN tar zxvf unixODBC-2.3.12.tar.gz
29+
RUN rm -f unixODBC-2.3.12.tar.gz
30+
WORKDIR unixODBC-2.3.12
3131
RUN env NM=${TARGET}-nm AS=${TARGET}-as LD=${TARGET}-ld CC=${TARGET}-gcc AR=${TARGET}-ar \
3232
RANLIB=${TARGET}-ranlib CFLAGS="-D_FORTIFY_SOURCE=2" LDFLAGS="-lssp" ./configure --host=${TARGET} --prefix=/usr/${TARGET}
3333
RUN ${TARGET}-make
3434
RUN ${TARGET}-make install
3535
WORKDIR /tmp
36-
RUN rm -rf unixODBC-2.3.7
36+
RUN rm -rf unixODBC-2.3.12
3737

3838
RUN wget -q https://github.com/sean-/ossp-uuid/archive/master.zip
3939
RUN unzip -qq master.zip

‎docker/all/scripts/install_ffead-cpp-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ tar xf "mongo-c-driver-$MONGO_VERSION.tar.gz"
5858
rm -f "mongo-c-driver-$MONGO_VERSION.tar.gz"
5959
cd mongo-c-driver-$MONGO_VERSION/ && mkdir _build && cmake -S . -B _build \
6060
-D ENABLE_EXTRA_ALIGNMENT=OFF \
61-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
61+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
6262
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
6363
-D BUILD_VERSION="$MONGO_VERSION" \
6464
-D ENABLE_SSL=OFF \

‎docker/install_cygwin.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ make install
88
cd /tmp
99
rm -rf libcuckoo-master
1010

11-
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.7.tar.gz
12-
tar zxf unixODBC-2.3.7.tar.gz
13-
cd unixODBC-2.3.7
11+
wget -q https://ftp.osuosl.org/pub/blfs/conglomeration/unixODBC/unixODBC-2.3.12.tar.gz
12+
tar zxf unixODBC-2.3.12.tar.gz
13+
cd unixODBC-2.3.12
1414
./configure
1515
make
1616
make install
1717
cd /tmp
18-
rm -rf unixODBC-2.3.7
18+
rm -rf unixODBC-2.3.12
1919

2020
wget -q https://github.com/redis/hiredis/archive/v0.13.3.tar.gz
2121
tar zxf v0.13.3.tar.gz

‎docker/install_mingw.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ tar xf "mongo-c-driver-$VERSION.tar.gz"
8989
rm -f "mongo-c-driver-$VERSION.tar.gz"
9090
cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -G "MinGW Makefiles" -S . -B _build \
9191
-D ENABLE_EXTRA_ALIGNMENT=OFF \
92-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
92+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
9393
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
9494
-D BUILD_VERSION="$VERSION" \
9595
-D ENABLE_SSL=OFF \

‎docker/os-based/DockerFile-Almalinux-x64-ffead-cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
5151
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
5252
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
5353
-D ENABLE_EXTRA_ALIGNMENT=OFF \
54-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
54+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
5555
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
5656
-D BUILD_VERSION="$VERSION" \
5757
-D ENABLE_SSL=OFF \

‎docker/os-based/DockerFile-Almalinux-x64-ffead-cpp_autoconf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
5151
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
5252
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
5353
-D ENABLE_EXTRA_ALIGNMENT=OFF \
54-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
54+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
5555
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
5656
-D BUILD_VERSION="$VERSION" \
5757
-D ENABLE_SSL=OFF \

‎docker/os-based/DockerFile-Alpine-x64-ffead-cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN tar xf "mongo-c-driver-$VERSION.tar.gz"
2727
RUN rm -f "mongo-c-driver-$VERSION.tar.gz"
2828
RUN cd mongo-c-driver-$VERSION/ && mkdir _build && cmake -S . -B _build \
2929
-D ENABLE_EXTRA_ALIGNMENT=OFF \
30-
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
30+
-D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -D ENABLE_TESTS=OFF -D ENABLE_EXAMPLES=OFF \
3131
-D CMAKE_BUILD_TYPE=RelWithDebInfo \
3232
-D BUILD_VERSION="$VERSION" \
3333
-D ENABLE_SSL=OFF \

0 commit comments

Comments
 (0)