CI: Use matrix config, cleanup

This commit is contained in:
Margen67 2022-05-17 22:47:04 -07:00 committed by Gliniak
parent 99e3a1a4b1
commit 8386ccf376
1 changed files with 9 additions and 14 deletions

View File

@ -2,7 +2,6 @@ name: CI
on: on:
push: push:
branches-ignore: [gh-pages, master]
paths-ignore: paths-ignore:
- '.clang-format' - '.clang-format'
- '.drone.star' - '.drone.star'
@ -24,7 +23,6 @@ on:
- 'LICENSE' - 'LICENSE'
- 'README.md' - 'README.md'
pull_request: pull_request:
branches-ignore: [gh-pages, master]
paths-ignore: paths-ignore:
- '.clang-format' - '.clang-format'
- '.drone.star' - '.drone.star'
@ -49,18 +47,15 @@ on:
jobs: jobs:
build-windows: build-windows:
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.config.runs-on }}
env: env:
POWERSHELL_TELEMETRY_OPTOUT: 1 POWERSHELL_TELEMETRY_OPTOUT: 1
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
runs-on: [windows-2019, windows-latest] config:
include: - {vsver: VS2022, runs-on: windows-latest}
- runs-on: windows-2019 - {vsver: VS2019, runs-on: windows-2019}
vsver: VS2019
- runs-on: windows-latest
vsver: VS2022
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
@ -79,18 +74,18 @@ jobs:
- name: Upload xenia-vfs-dump artifacts - name: Upload xenia-vfs-dump artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: xenia-vfs-dump_canary_${{ matrix.vsver }} name: xenia-vfs-dump_canary_${{ matrix.config.vsver }}
path: artifacts\xenia-vfs-dump path: artifacts\xenia-vfs-dump
if-no-files-found: error if-no-files-found: error
- name: Upload xenia artifacts - name: Upload xenia artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: xenia_canary_${{ matrix.vsver }} name: xenia_canary_${{ matrix.config.vsver }}
path: artifacts\xenia_canary path: artifacts\xenia_canary
if-no-files-found: error if-no-files-found: error
- name: Create release - name: Create release
if: | if: |
matrix.runs-on == 'windows-2019' && matrix.config.runs-on == 'windows-2019' &&
github.repository == 'xenia-canary/xenia-canary' && github.repository == 'xenia-canary/xenia-canary' &&
github.event.action != 'pull_request' && github.event.action != 'pull_request' &&
contains(github.ref, 'refs/heads/canary') && contains(github.ref, 'refs/heads/canary') &&
@ -104,11 +99,11 @@ jobs:
Throw "Error: Archive $asset too small!" Throw "Error: Archive $asset too small!"
} }
$tag=$env:GITHUB_SHA.SubString(0,7) $tag=$env:GITHUB_SHA.SubString(0,7)
$branch=$($env:GITHUB_REF -replace 'refs/heads/', '') $branch=$($env:GITHUB_REF -replace 'refs/heads/')
$title="${tag}_$branch" $title="${tag}_$branch"
gh release create $tag $asset --target $env:GITHUB_SHA -t $title gh release create $tag $asset --target $env:GITHUB_SHA -t $title
# Remove canary_ to prevent conflicts from tag # Remove canary_ to prevent conflicts from tag
$tag=$($branch -replace 'canary_', '') $tag=$($branch -replace 'canary_')
gh release delete $tag -y gh release delete $tag -y
git push --delete origin $tag git push --delete origin $tag
git tag -d $tag git tag -d $tag