Support trying local branches in submodule

qsniyg · Jan 21, 2019 · cf85e23 · cf85e23
1 parent 0dab69b
commit cf85e23
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/build b/build
@@ -171,10 +171,20 @@ if ! git diff-index --quiet HEAD --; then
 fi
 
 git fetch --all
-git checkout origin/${web_branch} || {
-    echo "ERROR: 'jellyfin-web' branch ${web_branch} is invalid."
-    exit 1
-}
+# If this is an official branch name, fetch it from origin
+official_branches_regex="^master$|^dev$|^release-.*$|^hotfix-.*$"
+if [[ ${web_branch} =~ ${official_branches_regex} ]]; then
+    git checkout origin/${web_branch} || {
+        echo "ERROR: 'jellyfin-web' branch 'origin/${web_branch}' is invalid."
+        exit 1
+    }
+# Otherwise, just check out the local branch (for testing, etc.)
+else
+    git checkout ${web_branch} || {
+        echo "ERROR: 'jellyfin-web' branch '${web_branch}' is invalid."
+        exit 1
+    }
+fi
 popd
 
 # Execute each platform and action in order, if said action is enabled

diff --git a/bump_version b/bump_version
@@ -47,10 +47,20 @@ if ! git diff-index --quiet HEAD --; then
 fi
 
 git fetch --all
-git checkout origin/${web_branch} || {
-    echo "ERROR: 'jellyfin-web' branch ${web_branch} is invalid."
-    exit 1
-}
+# If this is an official branch name, fetch it from origin
+official_branches_regex="^master$|^dev$|^release-.*$|^hotfix-.*$"
+if [[ ${web_branch} =~ ${official_branches_regex} ]]; then
+    git checkout origin/${web_branch} || {
+        echo "ERROR: 'jellyfin-web' branch 'origin/${web_branch}' is invalid."
+        exit 1
+    }
+# Otherwise, just check out the local branch (for testing, etc.)
+else
+    git checkout ${web_branch} || {
+        echo "ERROR: 'jellyfin-web' branch '${web_branch}' is invalid."
+        exit 1
+    }
+fi
 popd
 
 new_version="$1"