From a3df0602395f0d9bc61a87a996169a367b7ffe4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 24 Jan 2024 05:03:34 +0000 Subject: [PATCH] Do not download mysql-boost-5.7.44.tar.gz if already present #4438 --- .gitignore | 1 + test/deps/Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a047d63ea8..adcc2774b8 100644 --- a/.gitignore +++ b/.gitignore @@ -113,6 +113,7 @@ heaptrack.* # test deps test/deps/mariadb-connector-c/mariadb-connector-c-*/ test/deps/mysql-connector-c/mysql-5.7.*/ +test/deps/mysql-connector-c/mysql-boost-5.7.*.tar.gz #tap tests test/tap/tap/cpp-dotenv/cpp-dotenv-* diff --git a/test/deps/Makefile b/test/deps/Makefile index d045a0212b..0570da1f43 100644 --- a/test/deps/Makefile +++ b/test/deps/Makefile @@ -34,9 +34,10 @@ mariadb_client: mariadb-connector-c/mariadb-connector-c/libmariadb/libmariadbcli # cd mysql-connector-c/mysql-connector-c && cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(DEPS_PATH)/libssl/openssl # cd mysql-connector-c/mysql-connector-c && CC=${CC} CXX=${CXX} ${MAKE} mysqlclient mysql -mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a: - cd mysql-connector-c && curl -C - -O -s https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.44.tar.gz || true - cd mysql-connector-c && wget -nc -q https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.44.tar.gz || true +mysql-connector-c/mysql-boost-5.7.44.tar.gz: + cd mysql-connector-c && curl -C - -O -s https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.44.tar.gz || wget -nc -q https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-boost-5.7.44.tar.gz + +mysql-connector-c/mysql-connector-c/libmysql/libmysqlclient.a: mysql-connector-c/mysql-boost-5.7.44.tar.gz cd mysql-connector-c && rm -rf mysql-*/ || true cd mysql-connector-c && tar -zxf mysql-boost-5.7.*.tar.gz cd mysql-connector-c && ln -fsT $$(ls -1d mysql-5.7.*/) mysql-connector-c