From 13c4f08f162dacf98a7e8afc01b14a27f3b31641 Mon Sep 17 00:00:00 2001 From: Nikhil Sontakke Date: Wed, 13 Dec 2023 12:56:31 +0530 Subject: [PATCH] Fix OpenSSL issues by using latest MacOSx The latest OpenSSL 3.2.0 version has known issues with Postgres. MacOSX CI runs were failing because of this. We now use macos-13 visavis the earlier macos-11. That seems to solve this OpenSSL issue. --- .github/gh_matrix_builder.py | 2 +- .github/workflows/linux-build-and-test.yaml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/gh_matrix_builder.py b/.github/gh_matrix_builder.py index b1f296b5a72..b84b86d5527 100755 --- a/.github/gh_matrix_builder.py +++ b/.github/gh_matrix_builder.py @@ -146,7 +146,7 @@ def macos_config(overrides): "remote_connection", "compressed_collation", }, - "os": "macos-11", + "os": "macos-13", "pg_extra_args": "--with-libraries=/usr/local/opt/openssl/lib --with-includes=/usr/local/opt/openssl/include --without-icu", "pginstallcheck": True, "tsdb_build_args": "-DASSERTIONS=ON -DREQUIRE_ALL_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl", diff --git a/.github/workflows/linux-build-and-test.yaml b/.github/workflows/linux-build-and-test.yaml index 1172fccba97..df1a83ca846 100644 --- a/.github/workflows/linux-build-and-test.yaml +++ b/.github/workflows/linux-build-and-test.yaml @@ -69,10 +69,7 @@ jobs: - name: Install macOS Dependencies if: runner.os == 'macOS' run: | - # This is needed because GitHub image macos-10.15 version - # 20210927.1 did not install OpenSSL so we install openssl - # explicitly. - brew install openssl gawk + brew install gawk sudo perl -MCPAN -e "CPAN::Shell->notest('install', 'IPC::Run')" sudo perl -MCPAN -e "CPAN::Shell->notest('install', 'Test::Most')"