From e0b311624039317db00ab65af8bca15ebdcd00da Mon Sep 17 00:00:00 2001 From: Margen67 Date: Fri, 17 Jan 2020 07:16:11 -0800 Subject: [PATCH] Rename exe to xenia-canary, simplify CI steps, remove SSE2 SSE2 was only for troubleshooting Fable II, and didn't do anything anyway. --- .appveyor.yml | 6 +----- .azure-pipelines.yml | 11 ++++------- .github/workflows/main.yml | 3 +-- src/xenia/app/premake5.lua | 2 +- xenia-build | 2 +- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f55800a6f..a3f546156 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,10 +23,7 @@ skip_branch_with_pr: true pull_requests: do_not_increment_build_number: true -os: Visual Studio 2019 - -init: - - git config --global core.autocrlf input +image: Visual Studio 2019 install: - xb setup @@ -37,7 +34,6 @@ build_script: after_build: - |- cd build\bin\Windows\Release - ren xenia.exe xenia-canary.exe 7z a ..\..\..\..\xenia-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia-canary.exe 7z a ..\..\..\..\xenia-vfs-dump-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia-vfs-dump.exe cd ..\..\..\.. diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 07616938a..e0c3988a6 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -7,8 +7,8 @@ trigger: - master paths: exclude: - - docs/* - - .github/* + - docs/** + - .github/** - LICENSE - README.md - .appveyor.yml @@ -22,8 +22,8 @@ pr: - master paths: exclude: - - docs/* - - .github/* + - docs/** + - .github/** - LICENSE - README.md - .appveyor.yml @@ -35,8 +35,6 @@ jobs: vmImage: windows-latest strategy: matrix: - SSE2: # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs! - cpu_arch: SSE2 # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs! AVX: cpu_arch: AVX AVX2: @@ -52,7 +50,6 @@ jobs: - script: | cd build\bin\Windows\Release - ren xenia.exe xenia-canary.exe 7z a $(Build.ArtifactStagingDirectory)\xenia-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia-canary.exe 7z a $(Build.ArtifactStagingDirectory)\xenia-vfs-dump-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia-vfs-dump.exe displayName: 'Create archives' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 176d6d994..13011882c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: runs-on: windows-latest strategy: matrix: - cpu_arch: [SSE2, AVX, AVX2, AVX512] # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs! + cpu_arch: [AVX, AVX2, AVX512] steps: - uses: actions/checkout@master with: @@ -49,7 +49,6 @@ jobs: - name: Prepare artifacts run: | - ren build\bin\Windows\Release\xenia.exe xenia-canary.exe robocopy build\bin\Windows\Release artifacts xenia*.exe robocopy . artifacts LICENSE $LastExitCode = 0 diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index a385245ac..62f02d02a 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -5,7 +5,7 @@ group("src") project("xenia-app") uuid("d7e98620-d007-4ad8-9dbd-b47c8853a17f") kind("WindowedApp") - targetname("xenia") + targetname("xenia-canary") language("C++") links({ "aes_128", diff --git a/xenia-build b/xenia-build index 8463c77bd..cff6dfe5c 100755 --- a/xenia-build +++ b/xenia-build @@ -598,7 +598,7 @@ class BaseBuildCommand(Command): '--config', choices=['release', 'debug', 'checked'], default='release', type=str.lower, help='Chooses the build configuration.') self.parser.add_argument( - '--cpu_arch', choices=['sse2', 'avx', 'avx2', 'avx512'], default='sse2', + '--cpu_arch', choices=['avx', 'avx2', 'avx512'], default='avx', type=str.lower, help='Chooses the CPU architecture.') self.parser.add_argument( '--target', action='append', default=[],