Merge remote-tracking branch 'upstream/master' into support-running-without-web-content

5 years ago · 48ea7dc604
parent ef7497e837 bb8a1a38fb
commit 48ea7dc604
2 changed files with 2 additions and 2 deletions
--- a/.ci/azure-pipelines-main.yml
+++ b/.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
+          script: yarn install && yarn build
          workingDirectory: $(Agent.TempDirectory)/jellyfin-web

      - task: CopyFiles@2
--- a/.ci/azure-pipelines-windows.yml
+++ b/.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
+          script: yarn install && yarn build
          workingDirectory: $(Agent.TempDirectory)/jellyfin-web

      - task: CopyFiles@2