diff --git a/.github/actions/prepare-build/action.yml b/.github/actions/prepare-build/action.yml index e461e219..449c9117 100644 --- a/.github/actions/prepare-build/action.yml +++ b/.github/actions/prepare-build/action.yml @@ -31,7 +31,7 @@ runs: if: ${{ runner.os == 'macOS' }} shell: bash run: | - brew install llvm pkg-config nasm + brew install llvm pkg-config nasm go ln -s "/usr/local/opt/llvm/bin/clang-format" "/usr/local/bin/clang-format" ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy" diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 0751b5c0..9a7841f1 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -38,7 +38,6 @@ jobs: crypto: [openssl_1.1, openssl_3, boringssl] env: - BUILD_DIR: "${RUNNER_TEMP}/build_${{ matrix.crypto }}" CRYPTO_DIR: "./alternatives/${{ matrix.crypto }}" steps: @@ -55,18 +54,12 @@ jobs: - name: Build run: | - cmake -B "${{ env.BUILD_DIR }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" -DTESTING=ON - cmake --build "${{ env.BUILD_DIR }}" + cmake -B "${{ runner.temp }}/build_${{ matrix.crypto }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" -DTESTING=ON + cmake --build "${{ runner.temp }}/build_${{ matrix.crypto }}" - - name: Unit Test (non-Windows) - if: matrix.os != 'windows-latest' + - name: Unit Test run: | - cmake --build "${{ env.BUILD_DIR }}" --target test - - - name: Unit Test (Windows) - if: matrix.os == 'windows-latest' - run: | - cmake --build "${{ env.BUILD_DIR }}" --target RUN_TESTS + ctest --test-dir "${{ runner.temp }}/build_${{ matrix.crypto }}" interop-test: if: github.event.pull_request.draft == false @@ -75,7 +68,6 @@ jobs: runs-on: ubuntu-latest env: - BUILD_DIR: "${RUNNER_TEMP}/build_openssl_1.1" CRYPTO_DIR: "./alternatives/openssl_1.1" steps: @@ -92,8 +84,8 @@ jobs: - name: Build run: | - cmake -B "${{ env.BUILD_DIR }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" - cmake --build "${{ env.BUILD_DIR }}" + cmake -B "${{ runner.temp }}/build_openssl_1.1" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" + cmake --build "${{ runner.temp }}/build_openssl_1.1" - name: Build (Interop Harness) run: | @@ -124,7 +116,6 @@ jobs: crypto: [openssl_1.1, openssl_3, boringssl] env: - BUILD_DIR: "${RUNNER_TEMP}/build_${{ matrix.crypto }}" CRYPTO_DIR: "./alternatives/${{ matrix.crypto }}" steps: @@ -141,6 +132,6 @@ jobs: - name: Build with clang-tidy run: | - cmake -B "${{ env.BUILD_DIR }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" \ - -DTESTING=ON -DCLANG_TIDY=ON -DSANITIZERS=ON - cmake --build "${{ env.BUILD_DIR }}" + cmake -B "${{ runner.temp }}/build_${{ matrix.crypto }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" \ + -DTESTING=ON -DCLANG_TIDY=ON -DSANITIZERS=ON + cmake --build "${{ runner.temp }}/build_${{ matrix.crypto }}"