diff --git a/.appveyor.yml b/.appveyor.yml index 6153a22ae..ebbe27cca 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -40,10 +40,8 @@ build_script: after_build: - |- - cd build\bin\Windows\Release - 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 ..\..\..\.. + 7z a xenia-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-canary.exe + 7z a xenia-vfs-dump-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-vfs-dump.exe test: off diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 44e5fa151..e883f82f8 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -7,8 +7,10 @@ trigger: - master paths: exclude: - - docs/** - - .github/** + - docs/* + - docs/*/* + - .github/* + - .github/*/* - LICENSE - README.md - .appveyor.yml @@ -22,8 +24,10 @@ pr: - master paths: exclude: - - docs/** - - .github/** + - docs/* + - docs/*/* + - .github/* + - .github/*/* - LICENSE - README.md - .appveyor.yml @@ -52,9 +56,8 @@ jobs: displayName: 'Build' - script: | - cd build\bin\Windows\Release - 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 + 7z a $(Build.ArtifactStagingDirectory)\xenia-$(Build.SourceBranchName).zip LICENSE .\build\bin\Windows\Release\xenia-canary.exe + 7z a $(Build.ArtifactStagingDirectory)\xenia-vfs-dump-$(Build.SourceBranchName).zip LICENSE .\build\bin\Windows\Release\xenia-vfs-dump.exe displayName: 'Create archives' - publish: $(Build.ArtifactStagingDirectory) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2477c5671..07bc7577c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -9,7 +9,8 @@ on: - '.github/CONTRIBUTING.md' - '.github/FUNDING.md' - '.github/ISSUE_TEMPLATE.md' - - 'docs/**' + - 'docs/*' + - 'docs/*/*' - '.appveyor.yml' - '.azure-pipelines.yml' - '.travis.yml' @@ -23,7 +24,8 @@ on: - '.github/CONTRIBUTING.md' - '.github/FUNDING.md' - '.github/ISSUE_TEMPLATE.md' - - 'docs/**' + - 'docs/*' + - 'docs/*/*' - '.appveyor.yml' - '.azure-pipelines.yml' - '.travis.yml' @@ -41,7 +43,7 @@ jobs: run: wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status shell: cmd - - uses: actions/checkout@v2.0.0 + - uses: actions/checkout@v2 with: fetch-depth: 0 @@ -53,13 +55,12 @@ jobs: - name: Prepare artifacts run: | - robocopy build\bin\Windows\Release artifacts xenia*.exe - robocopy . artifacts LICENSE - $LastExitCode = 0 - cd artifacts - 7z a ..\xenia-canary.zip LICENSE xenia-canary.exe + mkdir artifacts + cp build/bin/Windows/Release/xenia*.exe LICENSE artifacts + 7z a xenia-canary.zip LICENSE ./artifacts/xenia-canary.exe + shell: bash - - uses: actions/upload-artifact@v1.0.0 + - uses: actions/upload-artifact@v1 with: name: xenia-canary-${{ matrix.cpu_arch }} path: artifacts