From b3fc995977cd5f76b28013e03bfd5992c99d1364 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sun, 24 Nov 2019 15:10:38 -0500 Subject: Add bad web build branch hotfix I hate this quick and dirty hack but it makes no sense to port to master. This fixes a bug whereby we'd build with the master Web branch on releases due to never checking out the right branch. This is already obsoleted in the master branch since #1925 already replaces this entire process for Debuntu builds, and others should be fixed with a more robust solution. That said, for the 10.4.z release chain, this ultra-quick solution fixes the problem without changing much. --- deployment/macos/Dockerfile | 1 + deployment/macos/docker-build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'deployment/macos') diff --git a/deployment/macos/Dockerfile b/deployment/macos/Dockerfile index 406a2d853e..63f599fbec 100644 --- a/deployment/macos/Dockerfile +++ b/deployment/macos/Dockerfile @@ -9,6 +9,7 @@ ENV SOURCE_DIR=/jellyfin ENV ARTIFACT_DIR=/dist ENV DEB_BUILD_OPTIONS=noddebs ENV ARCH=amd64 +ENV web_branch=release-10.4.z # Prepare Debian build environment RUN apt-get update \ diff --git a/deployment/macos/docker-build.sh b/deployment/macos/docker-build.sh index 1b4a554e6d..af11214ee6 100755 --- a/deployment/macos/docker-build.sh +++ b/deployment/macos/docker-build.sh @@ -14,7 +14,7 @@ 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} + git checkout origin/${web_branch} fi yarn install mkdir -p ${web_target} -- cgit v1.2.3