Merge branch '1.0'

.travis.yml

@@ -2,6 +2,10 @@
 #
 # Travis CI configuration
 
+arch:
+  - amd64
+  - arm64
+
 dist: trusty
 sudo: required
 
@@ -98,6 +102,24 @@ matrix:
       compiler: clang
     - env: OS=debian DIST=sid ARCH=i386
       compiler: clang
+    - env: OS=ubuntu DIST=xenial ARCH=i386
+      arch: arm64
+    - env: OS=ubuntu DIST=bionic ARCH=i386
+      arch: arm64
+    - env: OS=ubuntu DIST=disco ARCH=i386
+      arch: arm64
+    - env: OS=ubuntu DIST=eoan ARCH=i386
+      arch: arm64
+    - env: OS=debian DIST=jessie ARCH=i386
+      arch: arm64
+    - env: OS=debian DIST=stretch ARCH=i386
+      arch: arm64
+    - env: OS=debian DIST=buster ARCH=i386
+      arch: arm64
+    - env: OS=debian DIST=sid ARCH=i386
+      arch: arm64
+    - env: OS=el DIST=6
+      arch: arm64
     - env: OS=el DIST=6
       os: osx
     - env: OS=el DIST=7
@@ -132,12 +154,22 @@ matrix:
       compiler: clang
     - env: TARGET=distcheck
       os: osx
+    - env: TARGET=distcheck
+      arch: arm64
     - env: TARGET=coverage
       os: osx
     - env: TARGET=coverage
       compiler: clang
+    - env: TARGET=coverage
+      arch: arm64
     - os: osx
       compiler: gcc
+    - os: osx
+      arch: arm64
+    - arch: arm64
+      compiler: clang
+    - env: OS=debian DIST=jessie
+      arch: arm64
 
 addons:
   apt:
@@ -225,7 +257,7 @@ script:
     else
       # To avoid name conflicts, deploy source packages only for
       # "default", i.e. x86_64 architecture
-      if [[ -z "${ARCH}" ]]; then
+      if [[ -z "$ARCH" && "$TRAVIS_CPU_ARCH" == amd64 ]]; then
         PACKAGECLOUD_GLOB='build/*.{rpm,deb,dsc}'
       else
       # Exclude *.src.rpm and *.dsc