From db592425c7d0880e6d02f8410393b29fffb45825 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Thu, 1 Jul 2021 15:05:10 -0400
Subject: [PATCH] build and deploy

---
 .gitlab-ci.yml             | 30 +++++++++++++++---------------
 Scripts/build_aggregate.sh |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7735fb50..006d149e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
 #    - test
     - download
     - build
-#    - deploy
+    - deploy
 
 #test:
 #  stage: test
@@ -36,20 +36,20 @@ build_project:
   tags:
     - xcode_12_2
 
-#deploy_snapshot:
-#  stage: deploy
-#  script:
-#    - cd Scripts && ./upload_core_ui_frameworks.sh
-#  only:
-#    - branches
-#    - develop
-#  tags:
-#    - bash_shell
-#  environment:
-#    name: oneartifactory
-#    url: https://oneartifactoryprod.verizon.com/artifactory
-#  variables:
-#    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
+deploy_snapshot:
+  stage: deploy
+  script:
+    - cd Scripts && ./upload_core_ui_frameworks.sh
+  only:
+    - branches
+    - develop
+  tags:
+    - bash_shell
+  environment:
+    name: oneartifactory
+    url: https://oneartifactoryprod.verizon.com/artifactory
+  variables:
+    ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory
 
 #promote_snapshot:
 #  stage: go live
diff --git a/Scripts/build_aggregate.sh b/Scripts/build_aggregate.sh
index c0099cce..d3049bff 100755
--- a/Scripts/build_aggregate.sh
+++ b/Scripts/build_aggregate.sh
@@ -10,7 +10,7 @@ FRAMEWORKS_DIR=$BUILD_DIR/Frameworks
 UNIVERSAL_OUTPUTFOLDER=${BUILD_DIR}/universal
 
 # Step 1. Build Device and Simulator versions
-#xcodebuild -scheme "${C_PROJECT_NAME}" ONLY_ACTIVE_ARCH=NO -configuration ${PHONE_CONFIGURATION} -sdk iphoneos -archivePath "${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/${C_PROJECT_NAME}" archive SKIP_INSTALL=false FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR ALWAYS_SEARCH_USER_PATHS=true
+xcodebuild -scheme "${C_PROJECT_NAME}" ONLY_ACTIVE_ARCH=NO -configuration ${PHONE_CONFIGURATION} -sdk iphoneos -archivePath "${BUILD_DIR}/${PHONE_CONFIGURATION}-iphoneos/${C_PROJECT_NAME}" archive SKIP_INSTALL=false FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR ALWAYS_SEARCH_USER_PATHS=true
 
 xcodebuild -target "${C_PROJECT_NAME}" ONLY_ACTIVE_ARCH=NO -configuration ${SIMULATOR_CONFIGURATION} -sdk iphonesimulator BUILD_DIR=$BUILD_DIR FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR ALWAYS_SEARCH_USER_PATHS=true ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=true