-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(ci): OpenSSL EoL on mac/brew #4764
- Loading branch information
Showing
1 changed file
with
32 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 [email protected] mysql-client unixodbc libpq | ||
| - run: cmake -S. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DENABLE_TRACE=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -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<ThreadTest>.testTrySleep, | ||
| CppUnit::TestCaller<TimestampTest>.testTimestamp, | ||
| CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN, | ||
| CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN, | ||
| CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN, | ||
| CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN, | ||
| CppUnit::TestCaller<PollSetTest>.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 [email protected] mysql-client unixodbc libpq | ||
| # - run: cmake -S. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DENABLE_TRACE=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/[email protected] -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<ThreadTest>.testTrySleep, | ||
| # CppUnit::TestCaller<TimestampTest>.testTimestamp, | ||
| # CppUnit::TestCaller<ExpireLRUCacheTest>.testExpireN, | ||
| # CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN, | ||
| # CppUnit::TestCaller<UniqueExpireLRUCacheTest>.testExpireN, | ||
| # CppUnit::TestCaller<ExpireLRUCacheTest>.testAccessExpireN, | ||
| # CppUnit::TestCaller<PollSetTest>.testPollClosedServer" | ||
| # PWD=`pwd` | ||
| # ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" | ||
|
|
||
| macos-clang-cmake-openssl3: | ||
| runs-on: macos-latest | ||
|
|
||