From 8889a6b19370885c698b8716edc888154cf9f653 Mon Sep 17 00:00:00 2001 From: Soomin Lee Date: Thu, 1 Oct 2020 14:33:42 +0200 Subject: [PATCH 1/2] createDeployable.sh: Put Cocoapods related commands behind a flag --- createDeployable.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/createDeployable.sh b/createDeployable.sh index d601feb..e36636f 100755 --- a/createDeployable.sh +++ b/createDeployable.sh @@ -5,6 +5,7 @@ set -e ZIP="zip" VERSION="" COMPRESSION_FORMAT="zip" +ENABLE_PODS_COMMANDS=no STABLE_UPLOAD_URL="https://download.videolan.org/pub/cocoapods/prod/" usage() @@ -14,19 +15,23 @@ usage: $0 [options] OPTIONS -t Use tar + -p Enable Cocoapods related commands for release -z Use zip(default) -v Version -h Help EOF } -while getopts "htzv:" OPTION +while getopts "hptzv:" OPTION do case $OPTION in h) usage exit 1 ;; + p) + ENABLE_PODS_COMMANDS=yes + ;; t) COMPRESSION_FORMAT="tar.xz" ;; @@ -199,5 +204,7 @@ fi getVLCHashes packageBuild $options -bumpPodspec $PODSPEC -gitCommit $PODSPEC +if [ "$ENABLE_PODS_COMMANDS" = "yes" ]; then + bumpPodspec $PODSPEC + gitCommit $PODSPEC +fi From 4568ed4f34e41f6bab4f7d1d3da198a21d3b30cd Mon Sep 17 00:00:00 2001 From: Soomin Lee Date: Thu, 1 Oct 2020 14:48:02 +0200 Subject: [PATCH 2/2] gitlab-ci: Fix release build by passing Cocoapods flag --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3196eeb..1a31ca2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,4 +19,4 @@ VLCMediaLibraryKit: extends: .release-job-base script: - ./buildVLCMediaLibraryKit.sh -vck - - ./createDeployable.sh -v ${CI_COMMIT_TAG} + - ./createDeployable.sh -v ${CI_COMMIT_TAG} -p