aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorMike Taves <mwtoews@gmail.com>2022-01-24 00:45:14 +1300
committerGitHub <noreply@github.com>2022-01-24 00:45:14 +1300
commit93a533906e855a19ab5e64849df91e6fe9940712 (patch)
tree93216e4c071bfaf79beaf9c4e0874d79f39a2db6 /.github
parent93c3a165126ac4c7caf4d2ffa2f7dd71633e7be3 (diff)
downloadPROJ-93a533906e855a19ab5e64849df91e6fe9940712.tar.gz
PROJ-93a533906e855a19ab5e64849df91e6fe9940712.zip
CI: transition tests from autotools to cmake (#3023)
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/clang_linux.yml2
-rwxr-xr-x.github/workflows/clang_linux/start.sh7
-rwxr-xr-x.github/workflows/linux_gcc_32bit/start.sh16
-rwxr-xr-x.github/workflows/linux_gcc_5_4/start.sh11
-rwxr-xr-x.github/workflows/mac/install.sh6
-rwxr-xr-x.github/workflows/mingw_w64/start.sh4
6 files changed, 9 insertions, 37 deletions
diff --git a/.github/workflows/clang_linux.yml b/.github/workflows/clang_linux.yml
index ba52cc95..0b5450e9 100644
--- a/.github/workflows/clang_linux.yml
+++ b/.github/workflows/clang_linux.yml
@@ -1,4 +1,4 @@
-name: CLang Linux
+name: Clang Linux
on: [push, pull_request]
diff --git a/.github/workflows/clang_linux/start.sh b/.github/workflows/clang_linux/start.sh
index 286fdb69..3cb07c44 100755
--- a/.github/workflows/clang_linux/start.sh
+++ b/.github/workflows/clang_linux/start.sh
@@ -8,6 +8,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev jq python3-pip nlohmann-json3-dev
python3 -m pip install --user jsonschema
+export PATH=$HOME/.local/bin:$PATH
cd "$WORK_DIR"
@@ -16,16 +17,12 @@ 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
# -fno-use-cxa-atexit is needed to build with -coverage
-CC="ccache clang-10" CXX="ccache clang++-10" CFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" CXXFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" LDFLAGS="-fsanitize=address" ./travis/install.sh
-
-ccache -s
+CC="clang-10" CXX="clang++-10" CFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" CXXFLAGS="-Werror -fsanitize=address -fno-use-cxa-atexit" LDFLAGS="-fsanitize=address" ./travis/install.sh
echo "Saving ccache..."
rm -f "$WORK_DIR/ccache.tar.gz"
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"
diff --git a/.github/workflows/linux_gcc_5_4/start.sh b/.github/workflows/linux_gcc_5_4/start.sh
index 1dd8e3b0..fc7abb1e 100755
--- a/.github/workflows/linux_gcc_5_4/start.sh
+++ b/.github/workflows/linux_gcc_5_4/start.sh
@@ -23,13 +23,6 @@ python3 -m pip install --user cmake==3.9.6
export PATH=$HOME/.local/bin:$PATH
-export CC="ccache gcc"
-export CXX="ccache g++"
-
-NPROC=$(nproc)
-echo "NPROC=${NPROC}"
-export MAKEFLAGS="-j ${NPROC}"
-
cd "$WORK_DIR"
if test -f "$WORK_DIR/ccache.tar.gz"; then
@@ -37,16 +30,12 @@ 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
-
echo "Saving ccache..."
rm -f "$WORK_DIR/ccache.tar.gz"
(cd $HOME && tar czf "$WORK_DIR/ccache.tar.gz" .ccache)
diff --git a/.github/workflows/mac/install.sh b/.github/workflows/mac/install.sh
index ed27150f..44e84835 100755
--- a/.github/workflows/mac/install.sh
+++ b/.github/workflows/mac/install.sh
@@ -2,12 +2,8 @@
set -e
-export CCACHE_CPP2=yes
export PROJ_DB_CACHE_DIR="$HOME/.ccache"
ccache -M 200M
-ccache -s
-CC="ccache clang" CXX="ccache clang++" CFLAGS="-Werror -O2" CXXFLAGS="-Werror -O2" ./travis/install.sh
-
-ccache -s
+CC="clang" CXX="clang++" CFLAGS="-Werror" CXXFLAGS="-Werror" CMAKE_BUILD_TYPE=RelWithDebInfo ./travis/install.sh
diff --git a/.github/workflows/mingw_w64/start.sh b/.github/workflows/mingw_w64/start.sh
index 0c6d4766..0b64874e 100755
--- a/.github/workflows/mingw_w64/start.sh
+++ b/.github/workflows/mingw_w64/start.sh
@@ -51,8 +51,8 @@ ccache -s
MINGW_ARCH=x86_64-w64-mingw32
MINGW_PREFIX=/usr/lib/gcc/$MINGW_ARCH/7.3-posix
-export CC="ccache $MINGW_ARCH-gcc"
-export CXX="ccache $MINGW_ARCH-g++"
+export CC="$MINGW_ARCH-gcc"
+export CXX="$MINGW_ARCH-g++"
export LD=$MINGW_ARCH-ld
UNAME="$(uname)" || UNAME=""