Browse Source

Merge pull request #2631 from mark-monteiro/fix-client-build-scripts

Fix Client Build Scripts
dkanada 5 years ago
parent
commit
84c23d6232
5 changed files with 3 additions and 6 deletions
  1. 1 1
      .ci/azure-pipelines-main.yml
  2. 1 1
      .ci/azure-pipelines-windows.yml
  3. 0 1
      Dockerfile
  4. 0 1
      Dockerfile.arm
  5. 1 2
      Dockerfile.arm64

+ 1 - 1
.ci/azure-pipelines-main.yml

@@ -43,7 +43,7 @@ jobs:
         displayName: "Build Web Client"
         condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')), eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
         inputs:
-          script: yarn install && yarn build
+          script: yarn install
           workingDirectory: $(Agent.TempDirectory)/jellyfin-web
 
       - task: CopyFiles@2

+ 1 - 1
.ci/azure-pipelines-windows.yml

@@ -36,7 +36,7 @@ jobs:
         displayName: "Build Web Client"
         condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
         inputs:
-          script: yarn install && yarn build
+          script: yarn install
           workingDirectory: $(Agent.TempDirectory)/jellyfin-web
 
       - task: CopyFiles@2

+ 0 - 1
Dockerfile

@@ -7,7 +7,6 @@ RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
  && yarn install \
- && yarn build \
  && mv dist /dist
 
 FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder

+ 0 - 1
Dockerfile.arm

@@ -11,7 +11,6 @@ RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
  && yarn install \
- && yarn build \
  && mv dist /dist
 
 

+ 1 - 2
Dockerfile.arm64

@@ -11,7 +11,6 @@ RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
  && yarn install \
- && yarn build \
  && mv dist /dist
 
 
@@ -35,7 +34,7 @@ ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
-RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \ 
+RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
  ffmpeg \
  libssl-dev \
  ca-certificates \