mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/artifactoryci' into 'develop'

Browse Source 
Bugfix/artifactoryci

See merge request BPHV_MIPS/vds_ios!98
This commit is contained in:
Bruce, Matt R 2023-07-31 20:17:50 +00:00
commit 028aeb5f54
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -22,9 +22,9 @@ download_artifacts:
- bash_shell - bash_shell
environment: environment:
name: oneartifactory name: oneartifactory
url: https://oneartifactoryprod.verizon.com/artifactory url: https://oneartifactoryci.verizon.com/artifactory
variables: variables:
ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory ARTIFACTORY_URL: https://oneartifactoryci.verizon.com/artifactory
build_project: build_project:
stage: build stage: build
@ -47,9 +47,9 @@ deploy_snapshot:
- bash_shell - bash_shell
environment: environment:
name: oneartifactory name: oneartifactory
url: https://oneartifactoryprod.verizon.com/artifactory url: https://oneartifactoryci.verizon.com/artifactory
variables: variables:
ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory ARTIFACTORY_URL: https://oneartifactoryci.verizon.com/artifactory
#promote_snapshot: #promote_snapshot:
# stage: go live # stage: go live
@ -65,9 +65,9 @@ deploy_snapshot:
# - bash_shell # - bash_shell
# environment: # environment:
# name: oneartifactory # name: oneartifactory
# url: https://oneartifactoryprod.verizon.com/artifactory # url: https://oneartifactoryci.verizon.com/artifactory
# variables: # variables:
# ARTIFACTORY_URL: https://oneartifactoryprod.verizon.com/artifactory # ARTIFACTORY_URL: https://oneartifactoryci.verizon.com/artifactory
# #
#create_version_tag: #create_version_tag:
# stage: tag # stage: tag

2
Scripts/download_dependencies.sh
View File

@ -8,7 +8,7 @@
# Create new aggregate builds # Create new aggregate builds
if [ -z $ARTIFACTORY_URL ]; then if [ -z $ARTIFACTORY_URL ]; then
ARTIFACTORY_URL="https://oneartifactoryprod.verizon.com/artifactory" ARTIFACTORY_URL="https://oneartifactoryci.verizon.com/artifactory"
fi fi
BUILD_DIR=$(xcodebuild -showBuildSettings -project ./VDS.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-) BUILD_DIR=$(xcodebuild -showBuildSettings -project ./VDS.xcodeproj | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-)

2
Scripts/upload_vds_frameworks.sh
View File

@ -17,7 +17,7 @@ fi
# Create new aggregate builds # Create new aggregate builds
if [ -z $ARTIFACTORY_URL ]; then if [ -z $ARTIFACTORY_URL ]; then
ARTIFACTORY_URL="https://oneartifactoryprod.verizon.com/artifactory" ARTIFACTORY_URL="https://oneartifactoryci.verizon.com/artifactory"
fi fi
# Upload # Upload