diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index d98a2d8d..f8a9ab4e 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -12,22 +12,22 @@ jobs: strategy: fail-fast: false matrix: - build_configuration: [Debug] - build_platform: [x64] + build_configuration: [Release] + build_platform: ["Ninja"] steps: - name: Install openssl dev run: | choco install openssl --version=3.1.1 - dir "C:\Program Files" + choco install ninja + + - name: Add nmake + uses: ilammy/msvc-dev-cmd@v1 - name: Checkout repo uses: actions/checkout@v4 - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v1 - - name: Install Qt uses: jurplel/install-qt-action@v3 with: @@ -37,16 +37,16 @@ jobs: - name: generate cmake run: | - cmake -G "Visual Studio 17 2022" -A ${{ matrix.build_platform }} -T "v143" D:\a\AusweisApp\AusweisApp -B c:\_build + cmake -G "${{ matrix.build_platform }}" -DCMAKE_BUILD_TYPE="${{ matrix.build_configuration }}" -B _build - name: build cmake run: | - cmake --build c:\_build --config ${{ matrix.build_configuration }} --target package - # cmake --install c:\_build + cmake --build _build --config ${{ matrix.build_configuration }} --target package + cmake --install _build - # - name: run ctest - # run: | - # ctest --test-dir c:\_build --output-on-failure -C "${{ matrix.build_configuration }}" + - name: run ctest + run: | + ctest --test-dir _build --output-on-failure -C "${{ matrix.build_configuration }}" build_linux: diff --git a/.github/workflows/CI_build_combined.yml b/.github/workflows/CI_build_combined.yml index f9cea47d..97d9d7d7 100644 --- a/.github/workflows/CI_build_combined.yml +++ b/.github/workflows/CI_build_combined.yml @@ -68,7 +68,7 @@ jobs: - name: Install packages via apt run: | - sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev ninja-build + sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev libclang-13-dev ninja-build - name: generate cmake libs run: | @@ -106,7 +106,7 @@ jobs: - name: Install packages via apt run: | - sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev ninja-build + sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev libclang-13-dev ninja-build sudo apt -y remove firefox microsoft-edge-stable google-chrome-stable kotlin libmono* mono-runtime - name: generate cmake libs diff --git a/.github/workflows/CI_build_libs.yml b/.github/workflows/CI_build_libs.yml index b8b371bf..149a6934 100644 --- a/.github/workflows/CI_build_libs.yml +++ b/.github/workflows/CI_build_libs.yml @@ -42,7 +42,7 @@ jobs: - name: Install packages via apt run: | - sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev ninja-build + sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev libclang-13-dev ninja-build - name: generate cmake run: | @@ -66,7 +66,7 @@ jobs: - name: Install packages via apt run: | - sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev ninja-build + sudo apt-get update -qq && sudo apt install -y cmake pkg-config libssl-dev libudev-dev libhttp-parser-dev libpcsclite-dev libgl1-mesa-dev libdbus-1-dev libclang-15-dev libclang-13-dev ninja-build sudo apt -y remove firefox microsoft-edge-stable google-chrome-stable kotlin libmono* mono-runtime - name: generate cmake