Merge pull request #655 from joshuaboniface/local-web-branch

Support trying local branches in submodule

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

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"

deployment/debian-package-x64/pkg-src/changelog

@@ -45,6 +45,7 @@ jellyfin (10.1.0-1) unstable; urgency=medium
   * PR638 Removed XmlTv testfiles and nuget install
   * PR639 Fix segment_time_delta for ffmpeg 4.1
   * PR646: Fix infinite loop bug on subtitle.m3u8 request
+  * PR655: Support trying local branches in submodule
   * jellyfin-web:
   * PR1: Change webcomponents to non-minified version
   * PR4: Fix user profile regression

deployment/fedora-package-x64/pkg-src/jellyfin.spec

@@ -181,6 +181,7 @@ fi
 - PR638 Removed XmlTv testfiles and nuget install
 - PR639 Fix segment_time_delta for ffmpeg 4.1
 - PR646: Fix infinite loop bug on subtitle.m3u8 request
+- PR655: Support trying local branches in submodule
 - jellyfin-web:
 - PR1: Change webcomponents to non-minified version
 - PR4: Fix user profile regression