diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c0255b0..75eb505a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -206,19 +206,9 @@ jobs: shell: bash run: git config --global --add safe.directory ${GITHUB_WORKSPACE} && cmake -E make_directory build - - name: Install zlib - shell: bash - run: | - git clone --depth=1 https://github.com/madler/zlib.git zlib && cd zlib - cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_MINIZIP=OFF - cd build && make && sudo make install - - name: Install libpng shell: bash - run: | - git clone --depth=1 https://git.code.sf.net/p/libpng/code lpng && cd lpng - cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPNG_TESTS=OFF -DPNG_TOOLS=OFF - cd build && make && sudo make install + run: brew install libpng - name: Install GS1 Syntax Engine run: git clone --depth=1 https://github.com/gs1/gs1-syntax-engine && cd gs1-syntax-engine/src/c-lib && make CFLAGS_G='-DEXCLUDE_SYNTAX_DICTIONARY_LOADER' lib && (sudo make install || true) @@ -236,7 +226,7 @@ jobs: - name: Test working-directory: build shell: bash - run: LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$(pwd)/backend:/usr/local/lib" PATH=$PATH:"$(pwd)/frontend" ctest -V -C $BUILD_TYPE + run: LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$(pwd)/backend" PATH=$PATH:"$(pwd)/frontend" ctest -V -C $BUILD_TYPE build-macOS-sanitize: runs-on: macOS-latest @@ -275,11 +265,12 @@ jobs: with: usesh: true mem: 4096 - prepare: pkg install -y git cmake gmake gcc graphics/png + prepare: pkg install -y git cmake gmake gcc graphics/png qt5-core qt5-uitools qt5-buildtools qt5-qmake qt5-svg qt5-testlib run: | set -e git config --global --add safe.directory ${GITHUB_WORKSPACE} cmake -E make_directory build - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_SANITIZE=OFF -DZINT_USE_QT=OFF - cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE + cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON cmake --build build --config $BUILD_TYPE + cd build + ctest -V -C $BUILD_TYPE