[CI] Even moar changes
Remove CPU info step. Azure Pipelines: Remove unneeded robocopy for SDL2.dll, use direct path for artifact instead. GitHub Actions: Update ISSUE_TEMPLATE exclusion. Name stuff. Switch back to default shell/robocopy for artifact preparation. Seperate xenia-vfs-dump artifact. GitHub Actions/AppVeyor: Add -mx1 to 7z (supposedly faster)
This commit is contained in:
parent
1f0e5e8b7a
commit
b5b2eb73c4
|
@ -29,9 +29,6 @@ pull_requests:
|
||||||
|
|
||||||
image: Visual Studio 2019
|
image: Visual Studio 2019
|
||||||
|
|
||||||
init:
|
|
||||||
- wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- xb setup
|
- xb setup
|
||||||
|
|
||||||
|
@ -40,8 +37,8 @@ build_script:
|
||||||
|
|
||||||
after_build:
|
after_build:
|
||||||
- |-
|
- |-
|
||||||
7z a xenia-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-canary.exe
|
7z a -mx1 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
|
7z a -mx1 xenia-vfs-dump-%appveyor_repo_branch%.zip LICENSE .\build\bin\Windows\Release\xenia-vfs-dump.exe
|
||||||
|
|
||||||
test: off
|
test: off
|
||||||
|
|
||||||
|
|
|
@ -46,9 +46,6 @@ jobs:
|
||||||
AVX512:
|
AVX512:
|
||||||
cpu_arch: AVX512
|
cpu_arch: AVX512
|
||||||
steps:
|
steps:
|
||||||
- script: wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status
|
|
||||||
displayName: 'CPU info'
|
|
||||||
|
|
||||||
- script: xb setup
|
- script: xb setup
|
||||||
displayName: 'Setup'
|
displayName: 'Setup'
|
||||||
|
|
||||||
|
@ -58,7 +55,6 @@ jobs:
|
||||||
- script: |-
|
- script: |-
|
||||||
robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-canary xenia-canary.exe /r:0 /w:0
|
robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-canary xenia-canary.exe /r:0 /w:0
|
||||||
robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0
|
robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory)\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0
|
||||||
robocopy build\bin\Windows\Release $(Build.ArtifactStagingDirectory) SDL2.dll /r:0 /w:0
|
|
||||||
robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary LICENSE /r:0 /w:0
|
robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary LICENSE /r:0 /w:0
|
||||||
robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary-vfs-dump LICENSE /r:0 /w:0
|
robocopy . $(Build.ArtifactStagingDirectory)\xenia-canary-vfs-dump LICENSE /r:0 /w:0
|
||||||
IF %ERRORLEVEL% LEQ 7 (exit /b 0) ELSE (exit /b 1)
|
IF %ERRORLEVEL% LEQ 7 (exit /b 0) ELSE (exit /b 1)
|
||||||
|
@ -73,7 +69,7 @@ jobs:
|
||||||
artifact: xenia-vfs-dump
|
artifact: xenia-vfs-dump
|
||||||
displayName: 'Publish xenia-vfs-dump artifacts'
|
displayName: 'Publish xenia-vfs-dump artifacts'
|
||||||
|
|
||||||
- publish: $(Build.ArtifactStagingDirectory)\SDL2.dll
|
- publish: build\bin\Windows\Release\SDL2.dll
|
||||||
condition: and(succeeded(), eq(variables['Agent.JobName'], 'AVX'))
|
condition: and(succeeded(), eq(variables['Agent.JobName'], 'AVX'))
|
||||||
artifact: SDL2
|
artifact: SDL2
|
||||||
displayName: 'Publish SDL2 artifact(s)'
|
displayName: 'Publish SDL2 artifact(s)'
|
||||||
|
|
|
@ -8,7 +8,7 @@ on:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- '.github/CONTRIBUTING.md'
|
- '.github/CONTRIBUTING.md'
|
||||||
- '.github/FUNDING.md'
|
- '.github/FUNDING.md'
|
||||||
- '.github/ISSUE_TEMPLATE.md'
|
- '.github/ISSUE_TEMPLATE/*'
|
||||||
- 'docs/*'
|
- 'docs/*'
|
||||||
- 'docs/*/*'
|
- 'docs/*/*'
|
||||||
- '.appveyor.yml'
|
- '.appveyor.yml'
|
||||||
|
@ -23,7 +23,7 @@ on:
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- '.github/CONTRIBUTING.md'
|
- '.github/CONTRIBUTING.md'
|
||||||
- '.github/FUNDING.md'
|
- '.github/FUNDING.md'
|
||||||
- '.github/ISSUE_TEMPLATE.md'
|
- '.github/ISSUE_TEMPLATE/*'
|
||||||
- 'docs/*'
|
- 'docs/*'
|
||||||
- 'docs/*/*'
|
- 'docs/*/*'
|
||||||
- '.appveyor.yml'
|
- '.appveyor.yml'
|
||||||
|
@ -39,10 +39,6 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
cpu_arch: [AVX, AVX2, AVX512]
|
cpu_arch: [AVX, AVX2, AVX512]
|
||||||
steps:
|
steps:
|
||||||
- name: CPU info
|
|
||||||
run: wmic cpu get caption, deviceid, name, numberofcores, maxclockspeed, status
|
|
||||||
shell: cmd
|
|
||||||
|
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
@ -55,17 +51,28 @@ jobs:
|
||||||
|
|
||||||
- name: Prepare artifacts
|
- name: Prepare artifacts
|
||||||
run: |
|
run: |
|
||||||
mkdir artifacts
|
robocopy build\bin\Windows\Release artifacts\xenia-canary xenia-canary.exe /r:0 /w:0
|
||||||
cp build/bin/Windows/Release/xenia*.exe LICENSE artifacts
|
robocopy build\bin\Windows\Release artifacts\xenia-vfs-dump xenia-vfs-dump.exe /r:0 /w:0
|
||||||
7z a xenia-canary.zip LICENSE ./artifacts/xenia-canary.exe
|
robocopy . artifacts\xenia-canary LICENSE /r:0 /w:0
|
||||||
shell: bash
|
robocopy . artifacts\xenia-canary-vfs-dump LICENSE /r:0 /w:0
|
||||||
|
If ($LastExitCode -lt 8) { $LastExitCode = 0 }
|
||||||
|
7z a -mx1 xenia-canary.zip LICENSE .\artifacts\xenia-canary\*.exe
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v1
|
- name: Upload xenia-canary artifacts
|
||||||
|
uses: actions/upload-artifact@v1
|
||||||
with:
|
with:
|
||||||
name: xenia-canary-${{ matrix.cpu_arch }}
|
name: xenia-canary-${{ matrix.cpu_arch }}
|
||||||
path: artifacts
|
path: artifacts\xenia-canary
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v1
|
- name: Upload xenia-vfs-dump artifacts
|
||||||
|
uses: actions/upload-artifact@v1
|
||||||
|
if: matrix.cpu_arch == 'AVX'
|
||||||
|
with:
|
||||||
|
name: xenia-vfs-dump
|
||||||
|
path: artifacts\xenia-vfs-dump
|
||||||
|
|
||||||
|
- name: Upload SDL2 artifact(s)
|
||||||
|
uses: actions/upload-artifact@v1
|
||||||
if: matrix.cpu_arch == 'AVX'
|
if: matrix.cpu_arch == 'AVX'
|
||||||
with:
|
with:
|
||||||
name: SDL2
|
name: SDL2
|
||||||
|
|
Loading…
Reference in New Issue