Skip to content

Commit

Permalink
Revert changes to CI
Browse files Browse the repository at this point in the history
  • Loading branch information
bifurcation committed Dec 14, 2023
1 parent f722f0c commit e559182
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/main_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest] # XXX, ubuntu-latest, macos-latest]
crypto: [openssl_1.1] # XXX, openssl_3, boringssl]
os: [windows-latest, ubuntu-latest, macos-latest]
crypto: [openssl_1.1, openssl_3, boringssl]

env:
BUILD_DIR: "${RUNNER_TEMP}/build_${{ matrix.crypto }}"
Expand All @@ -55,18 +55,24 @@ jobs:

- name: Build
run: |
cmake -B "${{ env.BUILD_DIR }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" -DTESTING=ON -DSANITIZERS=ON
cmake -B "${{ env.BUILD_DIR }}" -DVCPKG_MANIFEST_DIR="${{ env.CRYPTO_DIR }}" -DTESTING=ON
cmake --build "${{ env.BUILD_DIR }}"
- name: Unit Test (non-Windows)
if: matrix.os != 'windows-latest'
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
# XXX(RLB): Unit tests are currently disabled on Windows because of two
# conflicting bugs. On the one hand, doctest has a bug that causes
# doctest_discover_tests to fail when tests are built with sanitizers. On the
# other hand, if tests are not built with sanitizers, then the unit tests hang
# in the middle of the test run.
#
# - name: Unit Test (Windows)
# if: matrix.os == 'windows-latest'
# run: |
# cmake --build "${{ env.BUILD_DIR }}" --target RUN_TESTS

interop-test:
if: github.event.pull_request.draft == false
Expand Down

0 comments on commit e559182

Please sign in to comment.