diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d36ea20..7735fb50 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ stages: # - test -# - download + - download - build # - deploy @@ -11,20 +11,20 @@ stages: # tags: # - xcode_12_2 -#download_artifacts: -# stage: download -# script: -# - ./Scripts/download_dependencies.sh -# only: -# - branches -# - feature/script_to_upload -# tags: -# - bash_shell -# environment: -# name: oneartifactory -# url: https://oneartifactoryprod.verizon.com/artifactory -# variables: -# ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory +download_artifacts: + stage: download + script: + - ./Scripts/download_dependencies.sh + only: + - branches + - feature/script_to_upload + tags: + - bash_shell + environment: + name: oneartifactory + url: https://oneartifactoryprod.verizon.com/artifactory + variables: + ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory build_project: stage: build diff --git a/Scripts/build_aggregate.sh b/Scripts/build_aggregate.sh index f73cde7d..f9ea8d63 100755 --- a/Scripts/build_aggregate.sh +++ b/Scripts/build_aggregate.sh @@ -14,8 +14,6 @@ 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 -#copy the framework into the build directory where it is looking for it. -#ditto "$FRAMEWORKS_DIR/MVMCore.framework" "${BUILD_DIR}/${SIMULATOR_CONFIGURATION}-iphonesimulator/MVMCore.framework xcodebuild -target "${C_PROJECT_NAME}" ONLY_ACTIVE_ARCH=NO -configuration ${SIMULATOR_CONFIGURATION} -sdk iphonesimulator FRAMEWORK_SEARCH_PATHS=$FRAMEWORKS_DIR ALWAYS_SEARCH_USER_PATHS=true ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=true #mkdir -p "${UNIVERSAL_OUTPUTFOLDER}"