diff options
| -rwxr-xr-x | build | 18 | ||||
| -rwxr-xr-x | bump_version | 18 | ||||
| -rw-r--r-- | deployment/debian-package-x64/pkg-src/changelog | 1 | ||||
| -rw-r--r-- | deployment/fedora-package-x64/pkg-src/jellyfin.spec | 1 |
4 files changed, 30 insertions, 8 deletions
@@ -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 index 0db6c18ad..c3f1a78d5 100755 --- 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" diff --git a/deployment/debian-package-x64/pkg-src/changelog b/deployment/debian-package-x64/pkg-src/changelog index 720040784..8670bac45 100644 --- a/deployment/debian-package-x64/pkg-src/changelog +++ b/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 diff --git a/deployment/fedora-package-x64/pkg-src/jellyfin.spec b/deployment/fedora-package-x64/pkg-src/jellyfin.spec index 28907b3d6..4afe01718 100644 --- a/deployment/fedora-package-x64/pkg-src/jellyfin.spec +++ b/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 |