From de0a0d71119d704fb7fe53a0d6777802df005018 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Mon, 20 May 2019 14:14:55 +0000
Subject: [PATCH] updated arm64 support for building and CI/CD

---
 .gitlab-ci.yml | 26 ++++++++++++++++++++------
 build-all.sh   |  2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ebea18e9..c9cf3dc5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,13 +43,20 @@ stages:
 #    - centos75
 #  variables:
 #    OS: 'centos75'  
+#
+#do-nightly-clean-arm32:
+#  <<: *do-nightly-clean
+#  tags:
+#    - arm32
+#  variables:
+#    OS: 'arm32'  
 
-do-nightly-clean-arm32:
+do-nightly-clean-arm64:
   <<: *do-nightly-clean
   tags:
-    - arm32
+    - arm64
   variables:
-    OS: 'arm32'  
+    OS: 'arm64'  
 
 
 #
@@ -83,13 +90,20 @@ do-nightly-clean-arm32:
 #    - centos75
 #  variables:
 #    OS: 'centos75'  
+#
+#do-build-arm32:
+#  <<: *do-build
+#  tags:
+#    - arm32
+#  variables:
+#    OS: 'arm32'  
 
-do-build-arm32:
+do-build-arm64:
   <<: *do-build
   tags:
-    - arm32
+    - arm64
   variables:
-    OS: 'arm32'  
+    OS: 'arm64'  
 
 
 #
diff --git a/build-all.sh b/build-all.sh
index c5b406399..d93b8e5a9 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -7,7 +7,7 @@ if [[ "$*" =~ "--debug" ]]; then
 fi
 
 
-if [[ $(uname -m) == 'armv7l' ]]; then
+if [[ $(uname -m) == 'armv7l' ]] || [[ $(uname -m) == 'aarch64' ]]; then
 	scons $SCONSDEBUG 
 else 
 	scons $SCONSDEBUG -j 3
-- 
GitLab