Sfoglia il codice sorgente

rn: don't tag builds by default

People run these in their own checkout and will run into problems because
tagging will fail.
master
Saúl Ibarra Corretgé 6 anni fa
parent
commit
47d5163c52
2 ha cambiato i file con 13 aggiunte e 9 eliminazioni
  1. 4
    5
      android/scripts/release-sdk.sh
  2. 9
    4
      ios/scripts/release-sdk.sh

+ 4
- 5
android/scripts/release-sdk.sh Vedi File

@@ -10,6 +10,7 @@ MVN_HTTP=0
10 10
 DEFAULT_SDK_VERSION=$(grep sdkVersion ${THIS_DIR}/../gradle.properties | cut -d"=" -f2)
11 11
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
12 12
 RN_VERSION=$(jq -r '.dependencies."react-native"' ${THIS_DIR}/../../package.json)
13
+DO_GIT_TAG=${GIT_TAG:-0}
13 14
 
14 15
 if [[ $THE_MVN_REPO == http* ]]; then
15 16
     MVN_HTTP=1
@@ -64,13 +65,11 @@ pushd ${THIS_DIR}/../
64 65
 ./gradlew clean assembleRelease publish
65 66
 popd
66 67
 
67
-if [[ $MVN_HTTP == 0 ]]; then
68
+if [[ $DO_GIT_TAG == 1 ]]; then
68 69
     # The artifacts are now on the Maven repo, commit them
69 70
     pushd ${MVN_REPO_PATH}
70
-    if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" == "true" ]]; then
71
-        git add -A .
72
-        git commit -m "Jitsi Meet SDK + dependencies: ${SDK_VERSION}"
73
-    fi
71
+    git add -A .
72
+    git commit -m "Jitsi Meet SDK + dependencies: ${SDK_VERSION}"
74 73
     popd
75 74
 
76 75
     # Tag the release

+ 9
- 4
ios/scripts/release-sdk.sh Vedi File

@@ -7,6 +7,7 @@ PROJECT_REPO=$(realpath ${THIS_DIR}/../..)
7 7
 RELEASE_REPO=$(realpath ${THIS_DIR}/../../../jitsi-meet-ios-sdk-releases)
8 8
 DEFAULT_SDK_VERSION=$(/usr/libexec/PlistBuddy -c "Print CFBundleShortVersionString" ${THIS_DIR}/../sdk/src/Info.plist)
9 9
 SDK_VERSION=${OVERRIDE_SDK_VERSION:-${DEFAULT_SDK_VERSION}}
10
+DO_GIT_TAG=${GIT_TAG:-0}
10 11
 
11 12
 
12 13
 echo "Releasing Jitsi Meet SDK ${SDK_VERSION}"
@@ -25,7 +26,9 @@ popd
25 26
 pushd ${PROJECT_REPO}
26 27
 rm -rf ios/sdk/JitsiMeet.framework
27 28
 xcodebuild -workspace ios/jitsi-meet.xcworkspace -scheme JitsiMeet -destination='generic/platform=iOS' -configuration Release archive
28
-git tag ios-sdk-${SDK_VERSION}
29
+if [[ $DO_GIT_TAG == 1 ]]; then
30
+    git tag ios-sdk-${SDK_VERSION}
31
+fi
29 32
 popd
30 33
 
31 34
 pushd ${RELEASE_REPO}
@@ -39,9 +42,11 @@ xcrun bitcode_strip -r Frameworks/JitsiMeet.framework/JitsiMeet -o Frameworks/Ji
39 42
 xcrun bitcode_strip -r Frameworks/WebRTC.framework/WebRTC -o Frameworks/WebRTC.framework/WebRTC
40 43
 
41 44
 # Add all files to git
42
-git add -A .
43
-git commit -m "${SDK_VERSION}"
44
-git tag ${SDK_VERSION}
45
+if [[ $DO_GIT_TAG == 1 ]]; then
46
+    git add -A .
47
+    git commit -m "${SDK_VERSION}"
48
+    git tag ${SDK_VERSION}
49
+fi
45 50
 
46 51
 popd
47 52
 

Loading…
Annulla
Salva