From 5d4c8d92fbf513c3d02344ad26c84e1ea3b49257 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Tue, 17 Mar 2020 10:32:34 -0700 Subject: [PATCH] [Azure Pipelines+GitHub Actions] Yet moar changes Save one robocopy by copying LICENSE to the build folder instead of copying it twice. Azure Pipelines: Switch artifact preparation to PowerShell to be consistent with GitHub Actions. --- .azure-pipelines.yml | 11 +++++------ .github/workflows/CI.yml | 9 ++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 94d3be297..512323e36 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -52,12 +52,11 @@ jobs: - script: xb build --cpu_arch=$(cpu_arch) --target=src\xenia-app --target=src\xenia-vfs-dump displayName: 'Build' - - script: |- - robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-canary xenia-canary.exe /r:0 /w:0 - robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0 - robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary LICENSE /r:0 /w:0 - robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary-vfs-dump LICENSE /r:0 /w:0 - IF %ERRORLEVEL% LEQ 7 (exit /b 0) ELSE (exit /b 1) + - pwsh: |- + robocopy . build\bin\Windows\Release LICENSE /r:0 /w:0 + robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-canary xenia-canary.exe LICENSE /r:0 /w:0 + robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-vfs-dump xenia-vfs-dump.exe LICENSE /r:0 /w:0 + If ($LastExitCode -le 7) { $LastExitCode = 0 } displayName: 'Prepare artifacts' - publish: $(Build.ArtifactStagingDirectory)\xenia-canary diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f1ffd559b..f35fa1e42 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,11 +51,10 @@ jobs: - name: Prepare artifacts run: | - robocopy build\bin\Windows\Release artifacts\xenia-canary xenia-canary.exe /r:0 /w:0 - robocopy build\bin\Windows\Release artifacts\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0 - robocopy . artifacts\xenia-canary LICENSE /r:0 /w:0 - robocopy . artifacts\xenia-canary-vfs-dump LICENSE /r:0 /w:0 - If ($LastExitCode -lt 8) { $LastExitCode = 0 } + robocopy . build\bin\Windows\Release LICENSE /r:0 /w:0 + robocopy build\bin\Windows\Release artifacts\xenia-canary xenia-canary.exe LICENSE /r:0 /w:0 + robocopy build\bin\Windows\Release artifacts\xenia-vfs-dump xenia-vfs-dump.exe LICENSE /r:0 /w:0 + If ($LastExitCode -le 7) { $LastExitCode = 0 } 7z a -mx1 xenia-canary.zip LICENSE .\artifacts\xenia-canary\*.exe - name: Upload xenia-canary artifacts