Removed PyPy version workaround for macOS 10.13 (#2414)

* removed pypy version workaround for macOS 10.13

* fix toolcache test on macos

* fixed an error

* disable strict name checking for imported powershell modules

* Ruby 3.0 doesn't exists on 10.13

Co-authored-by: Leonid Lapshin <originalnoe-nazvanie@yandex.ru>
This commit is contained in:
Leonid Lapshin
2021-01-14 12:17:44 +03:00
committed by GitHub
parent 0a255311b1
commit 2e06b1a227
15 changed files with 16 additions and 36 deletions

View File

@@ -79,13 +79,6 @@ pypyVersions=$(curl -4 -s --compressed $uri | grep 'osx64' | awk -v uri="$uri" -
toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .versions[]')
versionPattern="v[0-9]+\.[0-9]+\.[0-9]+-"
# PyPy 7.3.2 for High Sierra is broken, use 7.3.1 instead https://foss.heptapod.net/pypy/pypy/-/issues/3311
if is_HighSierra; then
versionPattern="v7.3.1-"
# PyPy 7.3.1 relies on system libffi.6.dylib, which is not existed in in libffi 3.3 release. As a workaround symlink can be created
ln -s libffi.7.dylib /usr/local/opt/libffi/lib/libffi.6.dylib
fi
for toolsetVersion in $toolsetVersions; do
latestMajorPyPyVersion=$(echo "${pypyVersions}" | grep -E "pypy${toolsetVersion}-${versionPattern}" | head -1)
if [[ -z "$latestMajorPyPyVersion" ]]; then