From 6ea8e043f3aee4de819231659bc86ad399baf5f7 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Wed, 15 Dec 2021 04:45:29 -0800 Subject: [PATCH] [AppVeyor] Cleanup Remove unneeded init: As far as I can tell this is a leftover from the appveyor.yml Reference: https://www.appveyor.com/docs/appveyor-yml/ Cleanup command blocks: cmd is the default shell, so it doesn't have to be specified. Use proper multi-line syntax for install. Make configuration into one line: This reduces line count, but is mainly personal preference. --- .appveyor.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index ad7a5db18..429e0e6ce 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,24 +25,20 @@ pull_requests: os: Visual Studio 2019 -init: - - git config --global core.autocrlf input - install: - - cmd: vcpkg integrate remove - - cmd: xb setup + - | + vcpkg integrate remove + xb setup platform: Windows -configuration: - - Release - - Checked +configuration: [Release, Checked] build_script: - - cmd: xb build --config=%CONFIGURATION% --target=src\xenia-app --target=tests\xenia-base-tests --target=tests\xenia-cpu-ppc-tests --target=src\xenia-vfs-dump + - xb build --config=%CONFIGURATION% --target=src\xenia-app --target=tests\xenia-base-tests --target=tests\xenia-cpu-ppc-tests --target=src\xenia-vfs-dump after_build: - - cmd: | + - | IF NOT "%CONFIGURATION%"=="Checked" SET "ARCHIVE_SUFFIX=%APPVEYOR_REPO_BRANCH%" IF NOT "%CONFIGURATION%"=="Checked" SET "ARCHIVE_SWITCHES=--" IF "%CONFIGURATION%"=="Checked" SET "ARCHIVE_SUFFIX=%APPVEYOR_REPO_BRANCH%_FOR-DEVS-ONLY" @@ -51,10 +47,10 @@ after_build: 7z a xenia-vfs-dump_%ARCHIVE_SUFFIX%.zip %ARCHIVE_SWITCHES% LICENSE "%APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia-vfs-dump.exe" "%APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia-vfs-dump.pdb" before_test: - - cmd: xb gentests + - xb gentests test_script: - - cmd: xb test --config=%CONFIGURATION% --no_build + - xb test --config=%CONFIGURATION% --no_build artifacts: - path: '*.zip'