From 6605de25775c7026aefe1b06f43eb53cc023dff6 Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov@tarantool.org>
Date: Wed, 1 Jun 2022 11:00:46 +0300
Subject: [PATCH] Revert "github-ci: use openssl@1.1"
This reverts commit 33830978870bbe8cdc3c23fa06ba0f141a960124.
Follow-up #6477
NO_DOC=ci
NO_TEST=ci
NO_CHANGELOG=ci
---
.travis.mk | 2 +-
cmake/os.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.mk b/.travis.mk
index 4aaca1d3ab..5c0d7bf221 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -356,7 +356,7 @@ test_odroid_arm64: deps_odroid_arm64 test_odroid_arm64_no_deps
# FIXME: Temporary pinned python3 to specific version (i.e. python@3.8) to
# avoid gevent package installation failure described in gevent/gevent#1721.
# Revert this back when the issue is resolved.
-OSX_PKGS=openssl@1.1 readline curl icu4c libiconv zlib cmake python@3.8
+OSX_PKGS=openssl readline curl icu4c libiconv zlib cmake python@3.8
deps_osx:
# install brew using command from Homebrew repository instructions:
diff --git a/cmake/os.cmake b/cmake/os.cmake
index ba65d0ccca..de493b0747 100644
--- a/cmake/os.cmake
+++ b/cmake/os.cmake
@@ -132,7 +132,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
endif()
# Detecting OpenSSL
- execute_process(COMMAND ${HOMEBREW_EXECUTABLE} --prefix openssl@1.1
+ execute_process(COMMAND ${HOMEBREW_EXECUTABLE} --prefix openssl
OUTPUT_VARIABLE HOMEBREW_OPENSSL
OUTPUT_STRIP_TRAILING_WHITESPACE)
if (DEFINED HOMEBREW_OPENSSL)
--
GitLab