diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ddaf738..463d2eba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -252,22 +252,6 @@ jobs: ./bootstrap.sh ./b2 -d0 headers - - name: Macos 11 specific - if: matrix.os == 'macos-11' - run: | - echo "macos - set up homebrew openssl" - cat > ~/user-config.jam </usr/local/opt/openssl/include - debug:/usr/local/opt/openssl/lib - windowsdebug:/usr/local/opt/openssl/debug/lib - release:/usr/local/opt/openssl/lib - ; - EOF - - name: Create user-config.jam if: matrix.compiler run: | @@ -404,19 +388,15 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup OpenSSL - env: - OPENSSL_ROOT: "C:\\OpenSSL" shell: cmd run: | - echo Install choco - powershell -Command iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')) if "${{matrix.addrmd}}" == "64" ( - choco install --no-progress -y openssl --x64 + choco install --no-progress -y openssl --x64 --version=3.1.1 ) if "${{matrix.addrmd}}" == "32" ( ; as of 17.08.23 openssl 3 doesn't support x86 set openssl_install_dir="C:\\Program Files (x86)\\OpenSSL-Win32" - choco install --no-progress -y openssl --forcex86 --version 1.1.1.2100 + choco install --no-progress -y openssl --forcex86 --version=1.1.1.2100 ) if "${{matrix.addrmd}}" == "64" ( @@ -426,7 +406,7 @@ jobs: set openssl_install_dir="C:\\Program Files\\OpenSSL-Win64" ) ) - mklink /D %OPENSSL_ROOT% %openssl_install_dir% + mklink /D C:\OpenSSL %openssl_install_dir% refreshenv set @@ -449,19 +429,15 @@ jobs: xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ git submodule update --init tools/boostdep python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY% - copy libs\%LIBRARY%\tools\user-config.jam %USERPROFILE%\user-config.jam - set OPENSSL_ROOT=C:\OpenSSL + echo using openssl : : ^"C:/OpenSSL/include" ^"C:/OpenSSL/lib" ^libssl ^libcrypto : ^${{matrix.addrmd}} ; >> %USERPROFILE%\user-config.jam cmd /c bootstrap b2 -d0 headers - name: Run tests shell: bash - env: - OPENSSL_ROOT: "C:/OpenSSL" run: | echo "current directory: $(pwd)" cd ../boost-root - export OPENSSL_ROOT="C:/OpenSSL" if [[ "${{matrix.supported}}" != "true" ]] ; then echo "This configuration is not supported because ${{matrix.supported}}" exit 0 diff --git a/Jamfile b/Jamfile index 4b8eb6c8..2f27e783 100644 --- a/Jamfile +++ b/Jamfile @@ -53,8 +53,6 @@ variant beast_ubasan BOOST_USE_ASAN=1 ; -path-constant TEST_MAIN : include/boost/beast/_experimental/unit_test/main.cpp ; - project /boost/beast ; local defines = diff --git a/test/beast/Jamfile b/test/beast/Jamfile index 6cb681b7..e655a8a1 100644 --- a/test/beast/Jamfile +++ b/test/beast/Jamfile @@ -10,7 +10,7 @@ alias run-tests : [ compile core.cpp ] [ compile http.cpp ] - [ compile ssl.cpp ] + [ compile ssl.cpp /boost/beast//lib-asio-ssl ] [ compile version.cpp ] [ compile websocket.cpp ] [ compile zlib.cpp ] diff --git a/test/beast/_experimental/Jamfile b/test/beast/_experimental/Jamfile index 7b9dddcb..a9b2d9f8 100644 --- a/test/beast/_experimental/Jamfile +++ b/test/beast/_experimental/Jamfile @@ -19,6 +19,7 @@ local RUN_TESTS ; for local f in $(SOURCES) { RUN_TESTS += [ run $(f) + /boost/beast//lib-asio-ssl /boost/beast/test//lib-test ] ; } @@ -27,12 +28,14 @@ alias run-tests : $(RUN_TESTS) ; exe fat-tests : $(SOURCES) + /boost/beast//lib-asio-ssl /boost/beast/test//lib-test ; explicit fat-tests ; run $(SOURCES) + /boost/beast//lib-asio-ssl /boost/beast/test//lib-test : : : : run-fat-tests ;