From 851b7008f7a69378088d851cd327e639a03315d6 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Mon, 25 Nov 2019 02:48:30 -0800 Subject: [PATCH] [CI] Skip master branch, also rename xenia.exe to xenia-canary.exe in AppVeyor+Azure --- .appveyor.yml | 12 +++++------- .azure-pipelines.yml | 9 ++++++--- .github/workflows/main.yml | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 97f002641..a65e9a338 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,21 +1,18 @@ version: 1.0.{build}-{branch} -clone_depth: 1 - -matrix: - fast_finish: true - branches: except: - gh-pages + - master skip_tags: true skip_commits: files: + - docs/*/* - .github/* + - .github/*/* - .travis.yml - - docs/* - src/**/*_posix.* - src/**/*_linux.* - src/**/*_x11.* @@ -44,7 +41,8 @@ build_script: after_build: - |- cd build\bin\Windows\Release - 7z a ..\..\..\..\xenia-%appveyor_repo_branch%.zip ..\..\..\..\LICENSE xenia.exe + 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 dc310950f..6b5235b8e 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -4,6 +4,7 @@ trigger: - '*' exclude: - gh-pages + - master paths: exclude: - docs/* @@ -18,6 +19,7 @@ pr: - '*' exclude: - gh-pages + - master paths: exclude: - docs/* @@ -33,8 +35,8 @@ jobs: vmImage: windows-latest strategy: matrix: - SSE2: - cpu_arch: SSE2 + 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: @@ -50,7 +52,8 @@ jobs: - script: | cd build\bin\Windows\Release - 7z a $(Build.ArtifactStagingDirectory)\xenia-$(Build.SourceBranchName).zip ..\..\..\..\LICENSE xenia.exe + 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 ed7231c48..74388b654 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,7 @@ on: push: branches-ignore: - 'gh-pages' + - 'master' paths-ignore: - '.github/CONTRIBUTING.md' - '.github/FUNDING.md' @@ -16,6 +17,7 @@ on: pull_request: branches-ignore: - 'gh-pages' + - 'master' paths-ignore: - '.github/CONTRIBUTING.md' - '.github/FUNDING.md' @@ -31,7 +33,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: [SSE2, AVX, AVX2, AVX512] # SSE2 BUILDS WON'T WORK ON NON-AVX(2) CPUs! steps: - uses: actions/checkout@master