Merge branch 'core20' into travis-test-ebp-core20

.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

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`

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

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"

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/"*