aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Boniface <joshua@boniface.me>2019-09-24 23:06:27 -0400
committerJoshua Boniface <joshua@boniface.me>2019-09-24 23:06:27 -0400
commit188ad540ee9023e310ef67f03914eeff197b3fc2 (patch)
tree88d9aed8fee740957ea4e7bfaa90591276c20645
parent12f24674fb59c4a56687debb01f9df908d8acc25 (diff)
Remove submodule handling from build script
-rwxr-xr-xbuild36
1 files changed, 1 insertions, 35 deletions
diff --git a/build b/build
index fb4ff1984..95d5d5c49 100755
--- a/build
+++ b/build
@@ -164,40 +164,6 @@ for target_platform in ${platform[@]}; do
fi
done
-if [[ ${web_branch} != 'local' ]]; then
- # Initialize submodules
- git submodule update --init --recursive
-
- # configure branch
- pushd MediaBrowser.WebDashboard/jellyfin-web
-
- if ! git diff-index --quiet HEAD --; then
- popd
- echo
- echo "ERROR: Your 'jellyfin-web' submodule working directory is not clean!"
- echo "This script will overwrite your unstaged and unpushed changes."
- echo "Please do development on 'jellyfin-web' outside of the submodule."
- exit 1
- fi
-
- git fetch --all
- # 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
-fi
-
# Execute each platform and action in order, if said action is enabled
pushd deployment/
for target_platform in ${platform[@]}; do
@@ -214,7 +180,7 @@ for target_platform in ${platform[@]}; do
for target_action in ${action[@]}; do
echo -e ">> Processing action ${target_action}"
if [[ -f ${target_action}.sh && -x ${target_action}.sh ]]; then
- ./${target_action}.sh
+ ./${target_action}.sh web_branch=${web_branch}
fi
done
if [[ -d pkg-dist/ ]]; then