Merge pull request #202 from radarhere/python38_untar

This commit is contained in:
Hugo van Kemenade 2021-05-29 21:11:42 +03:00 committed by GitHub
commit 91204438ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 7 deletions

View File

@ -33,6 +33,11 @@ jobs:
# os-name: "osx" # os-name: "osx"
# platform: "arm64" # platform: "arm64"
# python: "3.9" # python: "3.9"
# macos-target: "11.0"
# - os: "macos-11.0"
# os-name: "osx"
# platform: "arm64"
# python: "3.8"
# macos-target: "11.0" # macos-target: "11.0"
env: env:
BUILD_COMMIT: HEAD BUILD_COMMIT: HEAD
@ -77,11 +82,17 @@ jobs:
os-name: "osx" os-name: "osx"
- os: "ubuntu-20.04" - os: "ubuntu-20.04"
os-name: "focal" os-name: "focal"
- os: "macos-11.0" # Disable whilst not available
os-name: "osx" # - os: "macos-11.0"
platform: "arm64" # os-name: "osx"
python: "3.9" # platform: "arm64"
macos-target: "11.0" # python: "3.9"
# macos-target: "11.0"
# - os: "macos-11.0"
# os-name: "osx"
# platform: "arm64"
# python: "3.8"
# macos-target: "11.0"
env: env:
BUILD_COMMIT: master BUILD_COMMIT: master
PLAT: ${{ matrix.platform }} PLAT: ${{ matrix.platform }}

View File

@ -28,7 +28,14 @@ function untar {
gz|tgz) tar -zxf $in_fname ;; gz|tgz) tar -zxf $in_fname ;;
bz2) tar -jxf $in_fname ;; bz2) tar -jxf $in_fname ;;
zip) unzip -qq $in_fname ;; zip) unzip -qq $in_fname ;;
xz) unxz -c $in_fname | tar -xf - ;; xz) if [ -n "$IS_MACOS" ]; then
tar -xf $in_fname
else
if [[ ! $(type -P "unxz") ]]; then
echo xz must be installed to uncompress file; exit 1
fi
unxz -c $in_fname | tar -xf -
fi ;;
*) echo Did not recognize extension $extension; exit 1 ;; *) echo Did not recognize extension $extension; exit 1 ;;
esac esac
} }

@ -1 +1 @@
Subproject commit 63c1418ea5236f2586007c5397dab1d99d4cf1dd Subproject commit 125a047dfd81f6d22815f91cae8cdef1f81f02ac