From 592ab485a70ab4c8e4cefc37bbdfb76110f9205e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 9 Jan 2022 18:59:51 +0100 Subject: New upstream version 0.9.6 --- .github/workflows/build-and-test.yml | 89 ++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 15 deletions(-) (limited to '.github/workflows/build-and-test.yml') diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ba5cb84..293c9ca 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -12,31 +12,70 @@ on: jobs: build_and_test: name: Build and test - runs-on: ubuntu-latest + strategy: + matrix: + include: + - name: Native Linux + cmake_args: >- + -DCMAKE_C_COMPILER=clang-13 + -DCMAKE_CXX_COMPILER=clang++-13 + cflags: >- + -fsanitize=address,undefined,leak + -fno-sanitize-recover=all + -fno-omit-frame-pointer + ldflags: >- + -fsanitize=address + - name: MingGW on Linux + cmake_args: >- + -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc + -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ + -DCMAKE_SYSTEM_NAME=Windows + -DWIN32=ON + -DMINGW=ON + runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v2.4.0 - - name: Add Clang/LLVM repositories + - name: Add Clang/LLVM repositories (Non-MinGW) + if: "${{ ! contains(matrix.cmake_args, 'mingw') }}" run: |- wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main' + sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' - name: Install build dependencies run: |- + sudo apt-get update sudo apt-get install --yes --no-install-recommends -V \ - clang-11 \ cmake \ doxygen \ graphviz \ - llvm-11 \ lzip \ qhelpgenerator-qt5 \ qtchooser + - name: Install build dependencies (MinGW) + if: "${{ contains(matrix.cmake_args, 'mingw') }}" + run: |- + sudo dpkg --add-architecture i386 # for wine32 + sudo apt-add-repository ppa:ondrej/php -y # due to libwine:i386 conflicts + sudo apt-get update # again, due to new architecture + sudo apt-get install --yes --no-install-recommends -V \ + mingw-w64 \ + wine-stable \ + wine32 + + - name: Install build dependencies (Non-MinGW) + if: "${{ ! contains(matrix.cmake_args, 'mingw') }}" + run: |- + sudo apt-get install --yes --no-install-recommends -V \ + clang-13 \ + llvm-13 + - name: Build, test and install run: |- + set -x sed 's,:,\n,g' <<<"${PATH}" - clang --version + cmake --version GTEST_VERSION=1.8.1 GTEST_PREFIX=~/.local/ @@ -45,10 +84,15 @@ jobs: tar xf release-${GTEST_VERSION}.tar.gz ( cd googletest-release-${GTEST_VERSION}/ + + # Silence warning "Compatibility with CMake < 2.8.12 will be removed" + find -name CMakeLists.txt -print -exec sed 's/cmake_minimum_required.*/cmake_minimum_required(VERSION 3.0.2)/' -i {} \; + cmake \ -DBUILD_SHARED_LIBS=ON \ -DCVF_VERSION=${GTEST_VERSION} \ -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX} \ + ${{ matrix.cmake_args }} \ . make make install @@ -61,9 +105,7 @@ jobs: -O1 -g - -fsanitize=address,undefined,leak - -fno-sanitize-recover=all - -fno-omit-frame-pointer + ${{ matrix.cflags }} -Wall -Wextra @@ -71,7 +113,7 @@ jobs: ) CFLAGS="${compile_flags[*]} -std=c89" CXXFLAGS="${compile_flags[*]} -std=c++98" - LDFLAGS='-g -fsanitize=address' + LDFLAGS='-g ${{ matrix.ldflags }}' cmake_args=( -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX} @@ -80,20 +122,29 @@ jobs: -Wdeprecated -Werror=deprecated - -DCMAKE_C_COMPILER=clang-11 - -DCMAKE_CXX_COMPILER=clang++-11 -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" + ${{ matrix.cmake_args }} + -DURIPARSER_WARNINGS_AS_ERRORS=ON ) cmake "${cmake_args[@]}" -DCMAKE_INSTALL_INCLUDEDIR=include123 .. make VERBOSE=1 all + # NOTE: We need to copy some .dll files next to the + # Windows binaries so that they are ready to be executed + if [[ "${{ matrix.cmake_args }}" == *mingw* ]]; then + cp /usr/lib/gcc/i686-w64-mingw32/*-posix/libgcc_s_sjlj-1.dll ./ + cp /usr/lib/gcc/i686-w64-mingw32/*-posix/libstdc++-6.dll ./ + cp /usr/i686-w64-mingw32/lib/libwinpthread-1.dll ./ + cp "${GTEST_PREFIX}"/bin/libgtest.dll ./ + fi + make VERBOSE=1 test ARGS=--verbose cat Testing/Temporary/LastTest.log @@ -106,11 +157,19 @@ jobs: pushd cmake/test_find_package cmake "${cmake_args[@]}" . make VERBOSE=1 - ./hello + if [[ "${{ matrix.cmake_args }}" == *mingw* ]]; then + cp "${GTEST_PREFIX}"/bin/liburiparser-1.dll ./ + wine ./hello.exe + else + ./hello + fi popd git fetch --tags --unshallow origin # for "git describe" in make-distcheck.sh - ./make-distcheck.sh -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX} # without AddressSanitizer + GTEST_PREFIX="${GTEST_PREFIX}" \ + ./make-distcheck.sh \ + -DCMAKE_INSTALL_PREFIX:PATH=${GTEST_PREFIX} \ + ${{ matrix.cmake_args }} ! git status | fgrep -A100 'Untracked files:' # works best at the very end -- cgit v1.2.3