Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2018-11-21 20:51:15 +03:00
commit 93675f1d45
1 changed files with 4 additions and 2 deletions

View File

@ -83,11 +83,12 @@ configuration:
# scripts to run after build # scripts to run after build
after_build: after_build:
- 7z a xenia-%appveyor_repo_branch%.zip LICENSE %APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia.exe %APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia.pdb - 7z a xenia-%appveyor_repo_branch%.zip LICENSE %APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia.exe %APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia.pdb
- 7z a xenia-vfs-dump-%appveyor_repo_branch%.zip LICENSE %APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia-vfs-dump.exe %APPVEYOR_BUILD_FOLDER%\build\bin\%PLATFORM%\%CONFIGURATION%\xenia-vfs-dump.pdb
# to run your custom scripts instead of automatic MSBuild # to run your custom scripts instead of automatic MSBuild
# We also compile the tests here instead of later on. # We also compile the tests here instead of later on.
build_script: build_script:
- cmd: xb.bat build --config=%CONFIGURATION% --target=src\xenia-app --target=tests\xenia-cpu-ppc-tests - cmd: xb.bat build --config=%CONFIGURATION% --target=src\xenia-app --target=tests\xenia-cpu-ppc-tests --target=src\xenia-vfs-dump
# to disable automatic builds # to disable automatic builds
#build: off #build: off
@ -132,6 +133,7 @@ artifacts:
- path: xenia-cpu-ppc-test.log - path: xenia-cpu-ppc-test.log
- path: xenia-$(appveyor_repo_branch).zip - path: xenia-$(appveyor_repo_branch).zip
- path: xenia-vfs-dump-$(appveyor_repo_branch).zip
#---------------------------------# #---------------------------------#
@ -144,7 +146,7 @@ deploy:
- provider: Environment - provider: Environment
name: xenia-master name: xenia-master
release: xenia-$(appveyor_repo_branch)-v$(appveyor_build_version) release: xenia-$(appveyor_repo_branch)-v$(appveyor_build_version)
artifact: xenia-$(appveyor_repo_branch).zip artifact: xenia-$(appveyor_repo_branch).zip,xenia-vfs-dump-$(appveyor_repo_branch).zip
draft: false draft: false
prerelease: true prerelease: true
on: on: