From eb0b4692b18a8c390dde56c70d8d3504c0183b62 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Mon, 28 Jun 2021 17:30:55 -0400 Subject: [PATCH] fixes --- .gitlab-ci.yml | 3 ++- Scripts/upload_framework.sh | 5 ----- Scripts/upload_remote_view_frameworks.sh | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3708082..43842be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,9 +14,10 @@ build_project: stage: build script: - xcodebuild build -project MVMCore/MVMCore.xcodeproj -scheme FatLibrary | xcpretty + - BUILD_DIR=$(xcodebuild -showBuildSettings -project MVMCore/MVMCore.xcodeproj | grep BUILD_DIR) artifacts: paths: - - MVMCore/build/universal/MVMCore.framework + - ${BUILD_DIR}/universal/MVMCore.framework expire_in: 1 week only: - branches diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh index 0f312f0..5003d7e 100755 --- a/Scripts/upload_framework.sh +++ b/Scripts/upload_framework.sh @@ -25,11 +25,6 @@ echo ">>> UPLOAD START <<<" echo "Local path: ${LOCALPATH}" echo "Remote path: ${REMOTEPATH}" -ls "../MVMCore" -ls "../MVMCore/MVMCore" -ls "../MVMCore/build" -ls "../MVMCore/build/universal" - cat "${LOCALPATH}/Info.plist" LOCALBASE=$(basename "${LOCALPATH}") diff --git a/Scripts/upload_remote_view_frameworks.sh b/Scripts/upload_remote_view_frameworks.sh index c495882..6e7cd65 100755 --- a/Scripts/upload_remote_view_frameworks.sh +++ b/Scripts/upload_remote_view_frameworks.sh @@ -22,5 +22,5 @@ fi #xcodebuild -workspace "../RemoteView.xcworkspace" -scheme "RemoteViewAggregate" # Remote View Versions - -./upload_framework.sh $ARTIFACTORY_URL "../MVMCore/build/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT +BUILD_DIR=$(xcodebuild -showBuildSettings -project ../MVMCore/MVMCore.xcodeproj | grep BUILD_DIR) +./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/[VER]/MVMCore-[VER]-Debug-SNAPSHOT