diff options
| author | Joshua Boniface <joshua@boniface.me> | 2019-11-24 15:10:38 -0500 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-11-24 15:42:43 -0500 |
| commit | b3fc995977cd5f76b28013e03bfd5992c99d1364 (patch) | |
| tree | 67215a4e415452e115401589ecef4ecc15344fdb /deployment/macos | |
| parent | 7f5a0704067e95f9809bfa0f55deeac551160706 (diff) | |
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.
Diffstat (limited to 'deployment/macos')
| -rw-r--r-- | deployment/macos/Dockerfile | 1 | ||||
| -rwxr-xr-x | deployment/macos/docker-build.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/deployment/macos/Dockerfile b/deployment/macos/Dockerfile index 406a2d853..63f599fbe 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 1b4a554e6..af11214ee 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} |