diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 607116b5..fb9ec582 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,29 +115,32 @@ jobs: shell: bash run: | git clone --depth=1 https://github.com/madler/zlib.git zlib && cd zlib - cmake -B build -A Win32 -DCMAKE_BUILD_TYPE=Release -DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF -DZLIB_INSTALL_COMPAT_DLL=OFF - cmake --build build --config Release - cmake -E rename build/Release/zs.lib zlib.lib + cmake -B build -A Win32 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF -DZLIB_INSTALL_COMPAT_DLL=OFF + cmake --build build --config $BUILD_TYPE + cmake -E rename build/$BUILD_TYPE/zs.lib zlib.lib cmake -E rename build/zconf.h zconf.h - name: Install libpng shell: bash run: | git clone --depth=1 https://git.code.sf.net/p/libpng/code lpng && cd lpng - cmake -B build -A Win32 -DCMAKE_BUILD_TYPE=Release -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DZLIB_ROOT="../zlib" - cmake --build build --config Release - cmake -E rename build/Release/libpng16_static.lib libpng.lib + cmake -B build -A Win32 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DZLIB_ROOT="{$GITHUB_WORKSPACE}/zlib" + cmake --build build --config $BUILD_TYPE + cmake -E rename build/$BUILD_TYPE/libpng16_static.lib libpng.lib cmake -E rename build/pnglibconf.h pnglibconf.h - echo "GITHUB_WORKSPACE: $GITHUB_WORKSPACE" - ls $GITHUB_WORKSPACE + + - name: Install GS1 Syntax Engine + run: | + git clone --depth=1 https://github.com/gitlost/gs1-syntax-engine && cd gs1-syntax-engine/src/c-lib + cmake WIN32 -B build -A Win32 + cmake --build build --config $BUILD_TYPE + cmake -E rename build/$BUILD_TYPE/gs1encoders.lib gs1encoders.lib - name: Configure CMake working-directory: build shell: bash run: | - echo "GITHUB_WORKSPACE: ${GITHUB_WORKSPACE}" - ls $GITHUB_WORKSPACE - cmake $GITHUB_WORKSPACE -A Win32 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_USE_QT=OFF -DZLIB_ROOT="${GITHUB_WORKSPACE}/zlib" -DPNG_ROOT="${GITHUB_WORKSPACE}/lpng" + cmake $GITHUB_WORKSPACE -A Win32 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_USE_QT=OFF -DZLIB_ROOT="${GITHUB_WORKSPACE}/zlib" -DPNG_ROOT="${GITHUB_WORKSPACE}/lpng" -DGS1SE_PATH="%{GITHUB_WORKSPACE}/gs1-syntax-engine/src/c-lib" - name: Build working-directory: build @@ -147,7 +150,7 @@ jobs: - name: Test working-directory: build shell: bash - run: PATH=$PATH:"$(pwd)/backend/Release:$(pwd)/frontend/Release" ctest -V -C $BUILD_TYPE + run: PATH=$PATH:"$(pwd)/backend/$BUILD_TYPE:$(pwd)/frontend/$BUILD_TYPE" ctest -V -C $BUILD_TYPE build-windows-64bit: runs-on: windows-latest @@ -163,24 +166,24 @@ jobs: shell: bash run: | git clone --depth=1 https://github.com/madler/zlib.git zlib && cd zlib - cmake -B build -DCMAKE_BUILD_TYPE=Release -DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF -DZLIB_INSTALL_COMPAT_DLL=OFF - cmake --build build --config Release - cmake -E rename build/Release/zs.lib zlib.lib + cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF -DZLIB_INSTALL_COMPAT_DLL=OFF + cmake --build build --config $BUILD_TYPE + cmake -E rename build/$BUILD_TYPE/zs.lib zlib.lib cmake -E rename build/zconf.h zconf.h - 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=Release -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DZLIB_ROOT="../zlib" - cmake --build build --config Release - cmake -E rename build/Release/libpng16_static.lib libpng.lib + cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DZLIB_ROOT="{$GITHUB_WORKSPACE}/zlib" + cmake --build build --config $BUILD_TYPE + cmake -E rename build/$BUILD_TYPE/libpng16_static.lib libpng.lib cmake -E rename build/pnglibconf.h pnglibconf.h - name: Configure CMake working-directory: build shell: bash - run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_USE_QT=OFF -DZLIB_ROOT="../zlib" -DPNG_ROOT="../lpng" + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_USE_QT=OFF -DZLIB_ROOT="{$GITHUB_WORKSPACE}/zlib" -DPNG_ROOT="{$GITHUB_WORKSPACE}/lpng" - name: Build working-directory: build @@ -190,7 +193,7 @@ jobs: - name: Test working-directory: build shell: bash - run: PATH=$PATH:"$(pwd)/backend/Release:$(pwd)/frontend/Release" ctest -V -C $BUILD_TYPE + run: PATH=$PATH:"$(pwd)/backend/$BUILD_TYPE:$(pwd)/frontend/$BUILD_TYPE" ctest -V -C $BUILD_TYPE build-macOS: runs-on: macOS-latest