diff --git a/.travis.yml b/.travis.yml index 90771d521..28dd8969e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -273,9 +273,6 @@ matrix: env: SNAP=true TOXENV=integration-external,apacheconftest-external-with-pebble TARGET_ARCH=amd64 <<: *snap-config <<: *extended-test-suite - - env: SNAP=true TARGET_ARCH=i386 - <<: *snap-config - <<: *extended-test-suite - env: SNAP=true TARGET_ARCH=arm64 <<: *snap-config <<: *extended-test-suite diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index a91efd7f4..a429f9a2e 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -6,7 +6,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). ### Added -* Certbot snaps are now available for the i386, arm64, and armhf architectures. +* Certbot snaps are now available for the arm64 and armhf architectures. * Add minimal code to run Nginx plugin on NetBSD. * Make Certbot snap find externally snapped plugins * Function `certbot.compat.filesystem.umask` is a drop-in replacement for `os.umask` diff --git a/snap/local/build_and_install.sh b/snap/local/build_and_install.sh index f3b83a24e..7e76fcdc1 100755 --- a/snap/local/build_and_install.sh +++ b/snap/local/build_and_install.sh @@ -5,11 +5,6 @@ # Usage: build_and_install.sh [amd64,arm64,armhf] set -ex -if [[ -z "${TRAVIS}" ]]; then - echo "This script makes global changes to the system it is run on so should only be run in CI." - exit 1 -fi - SNAP_ARCH=$1 if [[ -z "${SNAP_ARCH}" ]]; then 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 b62730fc3..cabbf99e7 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-cp38-cp38-manylinux1_i686.whl b/snap/local/packages/cffi/cffi-1.14.0-cp38-cp38-manylinux1_i686.whl deleted file mode 100644 index 0dea9b9bc..000000000 Binary files a/snap/local/packages/cffi/cffi-1.14.0-cp38-cp38-manylinux1_i686.whl and /dev/null differ diff --git a/snap/local/packages/cryptography/cryptography-2.8-cp38-cp38-linux_i686.whl b/snap/local/packages/cryptography/cryptography-2.8-cp38-cp38-linux_i686.whl deleted file mode 100644 index 2e1b22f55..000000000 Binary files a/snap/local/packages/cryptography/cryptography-2.8-cp38-cp38-linux_i686.whl and /dev/null differ