lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support trying local branches in submodule

Browse Source
This commit is contained in:
Joshua Boniface 2019-01-21 12:10:48 -05:00
parent 0dab69b551
commit cf85e2327e
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build
View File

@ -171,10 +171,20 @@ if ! git diff-index --quiet HEAD --; then
fi fi
git fetch --all git fetch --all
git checkout origin/${web_branch} || { # If this is an official branch name, fetch it from origin
echo "ERROR: 'jellyfin-web' branch ${web_branch} is invalid." official_branches_regex="^master$|^dev$|^release-.*$|^hotfix-.*$"
exit 1 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 popd
# Execute each platform and action in order, if said action is enabled # Execute each platform and action in order, if said action is enabled

18
bump_version
View File

@ -47,10 +47,20 @@ if ! git diff-index --quiet HEAD --; then
fi fi
git fetch --all git fetch --all
git checkout origin/${web_branch} || { # If this is an official branch name, fetch it from origin
echo "ERROR: 'jellyfin-web' branch ${web_branch} is invalid." official_branches_regex="^master$|^dev$|^release-.*$|^hotfix-.*$"
exit 1 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 popd
new_version="$1" new_version="$1"