Skip to content

Commit 90e1d24

Browse files
committed
circleci: workaround for python ssl
1 parent 13b46a4 commit 90e1d24

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commands:
1616
name: Install dependencies
1717
command: |
1818
./opt/readies/bin/getpy
19-
BREW_NO_UPDATE=1 ./opt/system-setup.py
19+
BREW_NO_UPDATE=1 MACOS_PYTHON_SSL_FIX=1 ./opt/system-setup.py
2020
git clone git://github.com/antirez/redis.git --branch 5.0.7
2121
(cd redis && make malloc=libc -j $(nproc) && make install)
2222
redis-server --version

opt/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ endif
148148
python3 -m RLTest $(TEST_ARGS) --test $(TEST) --module $(INSTALL_DIR)/redisai.so --use-slaves ;\
149149
python3 -m RLTest $(TEST_ARGS) --test $(TEST) --module $(INSTALL_DIR)/redisai.so --use-aof
150150
# Commented until the MacOS CI is available
151-
python3 -m RLTest $(TEST_ARGS) --test double-panda.py --module $(INSTALL_DIR)/redisai.so
151+
# python3 -m RLTest $(TEST_ARGS) --test double-panda.py --module $(INSTALL_DIR)/redisai.so
152152

153153
#----------------------------------------------------------------------------------------------
154154

opt/system-setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ def macosx(self):
5656
if out.splitlines() == []:
5757
fatal("Xcode tools are not installed. Please run xcode-select --install.")
5858

59-
# workaround for ssl issue
60-
self.run("brew unlink python@2")
61-
self.run("brew reinstall python3")
59+
# workaround for ssl issue, needed in CircleCI
60+
if os.environ.get('MACOS_PYTHON_SSL_FIX') == '1':
61+
self.run("brew unlink python@2")
62+
self.run("brew reinstall python3")
6263

6364
self.install_gnu_utils()
6465
self.install("git-lfs")

0 commit comments

Comments
 (0)