From 8b1dcd304d658d04547af6eb5667674ed643f759 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 2 May 2023 21:17:25 +0200 Subject: [PATCH] Update ci-builds.yml --- .github/workflows/ci-builds.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml index 096776cb0..5a2571e81 100644 --- a/.github/workflows/ci-builds.yml +++ b/.github/workflows/ci-builds.yml @@ -61,7 +61,7 @@ jobs: uses: actions/checkout@v3 with: repository: 'sysown/proxysql' -# ref: 'v2.x' + ref: 'v2.x' fetch-depth: 0 path: 'proxysql' @@ -73,12 +73,17 @@ jobs: # echo "GIT_VERSION=${GIT_VERSION}" # echo "GIT_VERSION=${GIT_VERSION}" >> $GITHUB_ENV - - name: hot fix include + - name: hot-fixes run: | sed -i 's/-I$(CURL_IDIR) -I$(IDIR)/-I$(CURL_IDIR) -I${SQLITE3_DIR} -I$(IDIR)/' proxysql/test/tap/tests/Makefile sed -i '/#include "SpookyV2.h"/d' proxysql/test/tap/tests/aurora.cpp sed -i '/#include "SpookyV2.h"/d' proxysql/test/tap/tap/SQLite3_Server.cpp sed -i '/LDIRS=/a LDIRS+= -L$(DEPS_PATH)/coredumper/coredumper/src' proxysql/test/tap/tests/Makefile + sed -i '/STATIC_LIBS=/a STATIC_LIBS+= $(DEPS_PATH)/coredumper/coredumper/src/libcoredumper.a' proxysql/test/tap/tests/Makefile + sed -i '/#include "SpookyV2.h"/d' proxysql/test/tap/tests/galera_1_timeout_count.cpp + sed -i 's/dump_table_mysql_servers()/dump_table_mysql("mysql_servers")/' proxysql/test/tap/tests/galera_1_timeout_count.cpp + sed -i '/#include "SpookyV2.h"/d' proxysql/test/tap/tests/galera_2_timeout_no_count.cpp + sed -i 's/dump_table_mysql_servers()/dump_table_mysql("mysql_servers")/' proxysql/test/tap/tests/galera_2_timeout_no_count.cpp - name: Build id: build