From c8dade87a68643b1a07245742354ac294008965b Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Fri, 8 Nov 2024 16:58:46 -0600 Subject: [PATCH] fix(ci): OpenSSL EoL on mac/brew #4764 --- .github/workflows/ci.yml | 61 +++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c549f418a..761a41d946 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -257,12 +257,12 @@ jobs: runs-on: macos-13 steps: - uses: actions/checkout@v4 - - run: brew install openssl@1.1 mysql-client unixodbc libpq + - run: brew install openssl@3 mysql-client unixodbc libpq - run: >- ./configure --everything --no-prefix --omit=PDF --odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib --mysql-include=/usr/local/opt/mysql-client/include --mysql-lib=/usr/local/opt/mysql-client/lib - --include-path="/usr/local/opt/openssl@1.1/include" --library-path="/usr/local/opt/openssl@1.1/lib" && + --include-path="/usr/local/opt/openssl@3/include" --library-path="/usr/local/opt/openssl@3/lib" && make all -s -j6 - uses: ./.github/actions/retry-action with: @@ -288,12 +288,12 @@ jobs: runs-on: macos-13 steps: - uses: actions/checkout@v4 - - run: brew install openssl@1.1 mysql-client unixodbc libpq + - run: brew install openssl@3 mysql-client unixodbc libpq - run: >- ./configure --everything --no-prefix --cflags="-fvisibility=hidden" --omit=PDF --odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib --mysql-include=/usr/local/opt/mysql-client/include --mysql-lib=/usr/local/opt/mysql-client/lib - --include-path="/usr/local/opt/openssl@1.1/include" --library-path="/usr/local/opt/openssl@1.1/lib" && + --include-path="/usr/local/opt/openssl@3/include" --library-path="/usr/local/opt/openssl@3/lib" && make all -s -j6 - uses: ./.github/actions/retry-action with: @@ -314,31 +314,34 @@ jobs: EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF" ./ci/runtests.sh - macos-clang-cmake-openssl: - # macos-latest runs on Apple Silicon - runs-on: macos-latest - steps: - - uses: actions/checkout@v4 - - run: brew install openssl@1.1 mysql-client unixodbc libpq - - run: cmake -S. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DENABLE_TRACE=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all - - uses: ./.github/actions/retry-action - with: - timeout_minutes: 90 - max_attempts: 3 - retry_on: any - command: >- - cd cmake-build && - sudo -s - CPPUNIT_IGNORE=" - CppUnit::TestCaller.testTrySleep, - CppUnit::TestCaller.testTimestamp, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testPollClosedServer" - PWD=`pwd` - ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" +# +# https://github.com/pocoproject/poco/issues/4764 +# +# macos-clang-cmake-openssl: +# # macos-latest runs on Apple Silicon +# runs-on: macos-latest +# steps: +# - uses: actions/checkout@v4 +# - run: brew install openssl@1.1 mysql-client unixodbc libpq +# - run: cmake -S. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DENABLE_TRACE=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all +# - uses: ./.github/actions/retry-action +# with: +# timeout_minutes: 90 +# max_attempts: 3 +# retry_on: any +# command: >- +# cd cmake-build && +# sudo -s +# CPPUNIT_IGNORE=" +# CppUnit::TestCaller.testTrySleep, +# CppUnit::TestCaller.testTimestamp, +# CppUnit::TestCaller.testExpireN, +# CppUnit::TestCaller.testAccessExpireN, +# CppUnit::TestCaller.testExpireN, +# CppUnit::TestCaller.testAccessExpireN, +# CppUnit::TestCaller.testPollClosedServer" +# PWD=`pwd` +# ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" macos-clang-cmake-openssl3: runs-on: macos-latest