From 8d90ae1dc933ad1716ebba6cad5529a792d393c4 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sat, 6 Apr 2019 20:52:38 -0400 Subject: [PATCH] And another oops, but I confirmed the archive commands look right, so let's go for real now. --- azure-pipelines.yml | 2 +- azure-pipelines/windows-artifacts.yml | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4ad5862a..33980cb1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,7 +22,7 @@ jobs: - template: azure-pipelines/build-ninja.yml parameters: beforeBuild: call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - template: azure-pipelines/darwinunix-artifacts.yml + - template: azure-pipelines/windows-artifacts.yml parameters: os: windows arch: 386 diff --git a/azure-pipelines/windows-artifacts.yml b/azure-pipelines/windows-artifacts.yml index 9a1d364e..b5682a9e 100644 --- a/azure-pipelines/windows-artifacts.yml +++ b/azure-pipelines/windows-artifacts.yml @@ -11,12 +11,11 @@ parameters: steps: - powershell: | echo $PSVersionTable - Set-PSDebug -Trace 2 pushd build\meson-out Copy-Item @("..\..\ui.h","..\..\${{ parameters.osHeader }}") -Destination . - echo Compress-Archive `-Destination $(Build.ArtifactStagingDirectory)\libui-$(Build.SourceBranchName)-${{ parameters.os }}-${{ parameters.arch }}-${{ parameters.toolchain }}-${{ parameters.libtype }}.zip `-Path @("${{ parameters.libfiles }}".Split(" ") + @("ui.h","${{ parameters.osHeader}}")) - echo Compress-Archive `-Destination $(Build.ArtifactStagingDirectory)\examples-$(Build.SourceBranchName)-${{ parameters.os }}-${{ parameters.arch }}-${{ parameters.libtype }}.zip `-Path @("$(releaseExamples)".Split(" ") | % {$_ + ".exe"}) - del ui.h ${{ parameters.osHeader }} + Compress-Archive -Destination $(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"}) + Remove-Item @("ui.h","${{ parameters.osHeader }}") popd displayName: 'Create Artifacts' - task: PublishBuildArtifacts@1