From c1a0e2e3b67ca307480eed326525d37767dc8022 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 6 Apr 2019 20:34:45 -0400 Subject: [PATCH] Oops --- azure-pipelines.yml | 4 ++-- azure-pipelines/windows-artifacts.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c1e2542b..4ad5862a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -49,7 +49,7 @@ jobs: - template: azure-pipelines/build-ninja.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - afterBuild: ren build\meson-out\libui.a build\meson-out\libui.lib + afterBuild: ren build\meson-out\libui.a libui.lib - template: azure-pipelines/windows-artifacts.yml parameters: os: windows @@ -104,7 +104,7 @@ jobs: - template: azure-pipelines/build-ninja.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 - afterBuild: ren build\meson-out\libui.a build\meson-out\libui.lib + afterBuild: ren build\meson-out\libui.a libui.lib - template: azure-pipelines/windows-artifacts.yml parameters: os: windows diff --git a/azure-pipelines/windows-artifacts.yml b/azure-pipelines/windows-artifacts.yml index 69d63145..828ef4dc 100644 --- a/azure-pipelines/windows-artifacts.yml +++ b/azure-pipelines/windows-artifacts.yml @@ -14,7 +14,7 @@ steps: Set-PSDebug pushd build\meson-out Copy-Item @("..\..\ui.h","..\..\${{ parameters.osHeader }}") -Destination . - Compress-Archive $(Build.ArtifactStagingDirectory)\libui-$(Build.SourceBranchName)-${{ parameters.os }}-${{ parameters.arch }}-${{ parameters.toolchain }}-${{ parameters.libtype }}.zip -Path $("${{ parameters.libfiles }}",ui.h,${{ parameters.osHeader}}) + Compress-Archive $(Build.ArtifactStagingDirectory)\libui-$(Build.SourceBranchName)-${{ parameters.os }}-${{ parameters.arch }}-${{ parameters.toolchain }}-${{ parameters.libtype }}.zip -Path @("${{ parameters.libfiles }}".Split(" ") + @("ui.h","${{ parameters.osHeader}}")) Compress-Archive -Destination $(Build.ArtifactStagingDirectory)\examples-$(Build.SourceBranchName)-${{ parameters.os }}-${{ parameters.arch }}-${{ parameters.libtype }}.zip -Path @("$(releaseExamples)".Split(" ") | % {$_ + ".exe"}) del ui.h ${{ parameters.osHeader }} popd