admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mac circleci environment (#644)

Browse Source 
Apparently `Image xcode:9.0 is not supported` these days.
This commit is contained in:
Sam Clegg
2020-10-24 10:01:10 -07:00
committed by GitHub
parent da9419f42a
commit 10290f2f1d
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@@ -44,7 +44,7 @@ jobs:
scripts/test.py scripts/test.py
test-mac: test-mac:
macos: macos:
xcode: "9.0" xcode: "12.2.0"
environment: environment:
EMSDK_NOTTY: "1" EMSDK_NOTTY: "1"
# Without this, any `brew installl` command will result in self-update of # Without this, any `brew installl` command will result in self-update of

6
emsdk
View File

@@ -11,11 +11,17 @@ if [ -z "$EMSDK_PYTHON" ]; then
PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3 PYTHON3=$(dirname $0)/python/3.7.4-2_64bit/bin/python3
if [ -e $PYTHON3 ]; then if [ -e $PYTHON3 ]; then
EMSDK_PYTHON=$PYTHON3 EMSDK_PYTHON=$PYTHON3
# When using our bundled python we never want the users # When using our bundled python we never want the users
# PYTHONHOME or PYTHONPATH # PYTHONHOME or PYTHONPATH
# https://github.com/emscripten-core/emsdk/issues/598 # https://github.com/emscripten-core/emsdk/issues/598
unset PYTHONHOME unset PYTHONHOME
unset PYTHONPATH unset PYTHONPATH
# This is needed for MacOS. Without this, the urlopen
# code will try to use /usr/local/etc/openssl/cert.pem
# which may or may not exist on the system.
export SSL_CERT_FILE=$(dirname $0)/python/3.7.4-2_64bit/lib/python3.7/site-packages/certifi/cacert.pem
fi fi
fi fi

2
emsdk_manifest.json
View File

@@ -294,7 +294,7 @@
"macos_url": "python-3.7.4-2-macos.tar.gz", "macos_url": "python-3.7.4-2-macos.tar.gz",
"activated_path": "%installation_dir%/bin", "activated_path": "%installation_dir%/bin",
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'", "activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3" "activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.7/site-packages/certifi/cacert.pem"
}, },
{ {
"id": "java", "id": "java",