diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-16 00:14:33 +0100 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-03-16 00:14:33 +0100 |
| commit | 48ea7dc6046392356347a433a436cfd04b5e3f29 (patch) | |
| tree | 411a38bd9bd8b5fd0fc7885a71600fffb14ae033 | |
| parent | ef7497e837902e7bd0455d493e8fe9b36f8daaf6 (diff) | |
| parent | bb8a1a38fb52d6a558bb73377a18ee0d2a53715d (diff) | |
Merge remote-tracking branch 'upstream/master' into support-running-without-web-content
| -rw-r--r-- | .ci/azure-pipelines-main.yml | 2 | ||||
| -rw-r--r-- | .ci/azure-pipelines-windows.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/azure-pipelines-main.yml b/.ci/azure-pipelines-main.yml index 09901b2a6..e33ab72f2 100644 --- 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 diff --git a/.ci/azure-pipelines-windows.yml b/.ci/azure-pipelines-windows.yml index 32d1d1382..11856f9c8 100644 --- 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 |