diff options
author | Adrien Ferrand <adferrand@users.noreply.github.com> | 2020-06-17 01:57:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-17 01:57:05 +0300 |
commit | 0bb1f0b2ced2ac073471d44a2837706e3910e002 (patch) | |
tree | 62f03a9abb8be41d93ab7fed470680863b4dc0f2 /snap | |
parent | ba192f321d4247b9de11fe54cac87847fed694f5 (diff) |
Drop i386 architecture on snap build (#8083)
This PR remove the i386 architecture in the snap build process, because the base snap `core20` is not available for this architecture.
Diffstat (limited to 'snap')
-rw-r--r-- | snap/local/common.sh | 6 | ||||
-rwxr-xr-x | snap/local/compile_native_wheels.sh | 2 | ||||
-rw-r--r-- | snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl | bin | 377811 -> 0 bytes | |||
-rw-r--r-- | snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_i686.whl | bin | 694859 -> 0 bytes |
4 files changed, 2 insertions, 6 deletions
diff --git a/snap/local/common.sh b/snap/local/common.sh index 00a7614e8..7fc44e8ba 100644 --- a/snap/local/common.sh +++ b/snap/local/common.sh @@ -3,7 +3,7 @@ # Resolve the Snap architecture to Docker architecture (DOCKER_ARCH variable) # and QEMU architecture (QEMU_ARCH variable). -# Usage: ResolveArch [amd64|i386|arm64|armhf] +# Usage: ResolveArch [amd64|arm64|armhf] ResolveArch() { local SNAP_ARCH=$1 @@ -12,10 +12,6 @@ ResolveArch() { DOCKER_ARCH="amd64" QEMU_ARCH="x86_64" ;; - "i386") - DOCKER_ARCH="i386" - QEMU_ARCH="i386" - ;; "arm64") DOCKER_ARCH="arm64v8" QEMU_ARCH="aarch64" diff --git a/snap/local/compile_native_wheels.sh b/snap/local/compile_native_wheels.sh index 5dbb0f5d6..df909ba48 100755 --- a/snap/local/compile_native_wheels.sh +++ b/snap/local/compile_native_wheels.sh @@ -5,7 +5,7 @@ set -ex DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -TARGET_ARCHS="i386 arm64 armhf" +TARGET_ARCHS="arm64 armhf" rm -rf "${DIR}/packages/"* diff --git a/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl b/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl Binary files differdeleted file mode 100644 index 1e5491b6e..000000000 --- a/snap/local/packages/cffi/cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl +++ /dev/null diff --git a/snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_i686.whl b/snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_i686.whl Binary files differdeleted file mode 100644 index 18d7e6fd7..000000000 --- a/snap/local/packages/cryptography/cryptography-2.8-cp36-cp36m-linux_i686.whl +++ /dev/null |