From 93a533906e855a19ab5e64849df91e6fe9940712 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Mon, 24 Jan 2022 00:45:14 +1300 Subject: CI: transition tests from autotools to cmake (#3023) --- .github/workflows/linux_gcc_32bit/start.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to '.github/workflows/linux_gcc_32bit') diff --git a/.github/workflows/linux_gcc_32bit/start.sh b/.github/workflows/linux_gcc_32bit/start.sh index 81f1dc39..c54eb5ed 100755 --- a/.github/workflows/linux_gcc_32bit/start.sh +++ b/.github/workflows/linux_gcc_32bit/start.sh @@ -21,18 +21,12 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -o AP python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH -export CXXFLAGS='-g -O2 -m32 -D_GLIBCXX_ASSERTIONS' -export CFLAGS='-g -O2 -m32' +export CXXFLAGS='-m32 -D_GLIBCXX_ASSERTIONS' +export CFLAGS='-m32' export TIFF_CFLAGS=-I/usr/include/i386-linux-gnu export TIFF_LIBS="-L/usr/lib/i386-linux-gnu -ltiff" export SQLITE3_CFLAGS=-I/usr/include/i386-linux-gnu export SQLITE3_LIBS="-L/usr/lib/i386-linux-gnu -lsqlite3" -export CC="ccache gcc" -export CXX="ccache g++" - -NPROC=$(nproc) -echo "NPROC=${NPROC}" -export MAKEFLAGS="-j ${NPROC}" cd "$WORK_DIR" @@ -41,15 +35,11 @@ if test -f "$WORK_DIR/ccache.tar.gz"; then (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz") fi -export CCACHE_CPP2=yes export PROJ_DB_CACHE_DIR="$HOME/.ccache" ccache -M 500M -ccache -s - -CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh -ccache -s +CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" CMAKE_BUILD_TYPE=RelWithDebInfo ./travis/install.sh echo "Saving ccache..." rm -f "$WORK_DIR/ccache.tar.gz" -- cgit v1.2.3