From 66e7e8bcd2f4a92f9a5c7d8a932d6e0678018e77 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 5 Apr 2020 15:20:08 -0400 Subject: [PATCH] Make the portable packages build the right tag Will change for 10.5.4, but quickfix for now --- deployment/linux-x64/docker-build.sh | 4 +--- deployment/macos/docker-build.sh | 4 +--- deployment/portable/docker-build.sh | 4 +--- deployment/win-x64/docker-build.sh | 4 +--- deployment/win-x86/docker-build.sh | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/deployment/linux-x64/docker-build.sh b/deployment/linux-x64/docker-build.sh index e33328a36a..979d8ca429 100755 --- a/deployment/linux-x64/docker-build.sh +++ b/deployment/linux-x64/docker-build.sh @@ -13,9 +13,7 @@ web_build_dir="$( mktemp -d )" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ pushd ${web_build_dir} -if [[ -n ${web_branch} ]]; then - checkout -b origin/${web_branch} -fi +git checkout tags/v10.5.3 yarn install mkdir -p ${web_target} mv dist/* ${web_target}/ diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh index f9417388d7..5092d61198 100755 --- a/deployment/macos/docker-build.sh +++ b/deployment/macos/docker-build.sh @@ -13,9 +13,7 @@ web_build_dir="$( mktemp -d )" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ pushd ${web_build_dir} -if [[ -n ${web_branch} ]]; then - checkout -b origin/${web_branch} -fi +git checkout tags/v10.5.3 yarn install mkdir -p ${web_target} mv dist/* ${web_target}/ diff --git a/deployment/portable/docker-build.sh b/deployment/portable/docker-build.sh index 094190bbf6..0ba2088c8e 100755 --- a/deployment/portable/docker-build.sh +++ b/deployment/portable/docker-build.sh @@ -13,9 +13,7 @@ web_build_dir="$( mktemp -d )" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ pushd ${web_build_dir} -if [[ -n ${web_branch} ]]; then - checkout -b origin/${web_branch} -fi +git checkout tags/v10.5.3 yarn install mkdir -p ${web_target} mv dist/* ${web_target}/ diff --git a/deployment/win-x64/docker-build.sh b/deployment/win-x64/docker-build.sh index 79e5fb0bcd..607b3eba16 100755 --- a/deployment/win-x64/docker-build.sh +++ b/deployment/win-x64/docker-build.sh @@ -19,9 +19,7 @@ web_build_dir="$( mktemp -d )" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ pushd ${web_build_dir} -if [[ -n ${web_branch} ]]; then - checkout -b origin/${web_branch} -fi +git checkout tags/v10.5.3 yarn install mkdir -p ${web_target} mv dist/* ${web_target}/ diff --git a/deployment/win-x86/docker-build.sh b/deployment/win-x86/docker-build.sh index 977dcf78fa..2439a532ca 100755 --- a/deployment/win-x86/docker-build.sh +++ b/deployment/win-x86/docker-build.sh @@ -19,9 +19,7 @@ web_build_dir="$( mktemp -d )" web_target="${SOURCE_DIR}/MediaBrowser.WebDashboard/jellyfin-web" git clone https://github.com/jellyfin/jellyfin-web.git ${web_build_dir}/ pushd ${web_build_dir} -if [[ -n ${web_branch} ]]; then - checkout -b origin/${web_branch} -fi +git checkout tags/v10.5.3 yarn install mkdir -p ${web_target} mv dist/* ${web_target}/