generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-12-09 16:36:51 +01:00
Code Issues Projects Releases Wiki Activity

fix(ci): OpenSSL EoL on mac/brew #4764

Browse Source
This commit is contained in:
Alex Fabijanic
2024-11-08 16:58:46 -06:00
parent c156f0b357
commit c8dade87a6
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
.github/workflows/ci.yml vendored
View File

@@ -257,12 +257,12 @@ jobs:
runs-on: macos-13 runs-on: macos-13
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- run: brew install openssl@1.1 mysql-client unixodbc libpq - run: brew install openssl@3 mysql-client unixodbc libpq
- run: >- - run: >-
./configure --everything --no-prefix --omit=PDF ./configure --everything --no-prefix --omit=PDF
--odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib --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 --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 make all -s -j6
- uses: ./.github/actions/retry-action - uses: ./.github/actions/retry-action
with: with:
@@ -288,12 +288,12 @@ jobs:
runs-on: macos-13 runs-on: macos-13
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- run: brew install openssl@1.1 mysql-client unixodbc libpq - run: brew install openssl@3 mysql-client unixodbc libpq
- run: >- - run: >-
./configure --everything --no-prefix --cflags="-fvisibility=hidden" --omit=PDF ./configure --everything --no-prefix --cflags="-fvisibility=hidden" --omit=PDF
--odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib --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 --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 make all -s -j6
- uses: ./.github/actions/retry-action - uses: ./.github/actions/retry-action
with: with:
@@ -314,31 +314,34 @@ jobs:
EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF" EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF"
./ci/runtests.sh ./ci/runtests.sh
macos-clang-cmake-openssl: #
# macos-latest runs on Apple Silicon # https://github.com/pocoproject/poco/issues/4764
runs-on: macos-latest #
steps: # macos-clang-cmake-openssl:
- uses: actions/checkout@v4 # # macos-latest runs on Apple Silicon
- run: brew install openssl@1.1 mysql-client unixodbc libpq # runs-on: macos-latest
- 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 # steps:
- uses: ./.github/actions/retry-action # - uses: actions/checkout@v4
with: # - run: brew install openssl@1.1 mysql-client unixodbc libpq
timeout_minutes: 90 # - 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
max_attempts: 3 # - uses: ./.github/actions/retry-action
retry_on: any # with:
command: >- # timeout_minutes: 90
cd cmake-build && # max_attempts: 3
sudo -s # retry_on: any
CPPUNIT_IGNORE=" # command: >-
CppUnit::TestCaller<ThreadTest>.testTrySleep, # cd cmake-build &&
CppUnit::TestCaller<TimestampTest>.testTimestamp, # sudo -s
CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN, # CPPUNIT_IGNORE="
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN, # CppUnit::TestCaller<ThreadTest>.testTrySleep,
CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN, # CppUnit::TestCaller<TimestampTest>.testTimestamp,
CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN, # CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN,
CppUnit::TestCaller<PollSetTest>.testPollClosedServer" # CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
PWD=`pwd` # CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN,
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" # CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN,
# CppUnit::TestCaller<PollSetTest>.testPollClosedServer"
# PWD=`pwd`
# ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
macos-clang-cmake-openssl3: macos-clang-cmake-openssl3:
runs-on: macos-latest runs-on: macos-latest