Skip to content

Commit aa13eab

Browse files
Merge branch 'LiveSplit:master' into master
2 parents d343e9f + 6f71599 commit aa13eab

File tree

3 files changed

+15724
-7843
lines changed

3 files changed

+15724
-7843
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,41 @@ name: CI
22

33
on:
44
pull_request:
5+
merge_group:
6+
push:
7+
branches:
8+
- 'master'
59

610
jobs:
711
build:
8-
runs-on: windows-2019
12+
runs-on: windows-latest
913

1014
steps:
1115
- name: Checkout LiveSplit
12-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1317
with:
1418
submodules: recursive
1519
repository: LiveSplit/LiveSplit
1620

17-
- name: Checkout commit
18-
uses: actions/checkout@v2
21+
- name: Checkout LiveSplit.AutoSplitters
22+
uses: actions/checkout@v4
1923
with:
2024
path: autosplitters_xml
2125

22-
- name: Move Auto Splitters XML
26+
- name: Move Autosplitters XML
2327
run: mv -force autosplitters_xml/LiveSplit.AutoSplitters.xml .
2428

2529
- name: Set up .NET environment
26-
uses: vrnobody/[email protected]
27-
28-
- name: Install NuGet packages
29-
run: nuget restore LiveSplit\LiveSplit.sln
30-
31-
- name: Build LiveSplit
32-
run: msbuild LiveSplit\LiveSplit.sln /verbosity:minimal /p:NoWarn=1591 /p:Configuration=Release
30+
uses: actions/setup-dotnet@v4
31+
with:
32+
dotnet-version: '8.x'
3333

3434
- name: Run tests
35-
run: |
36-
& "vstest.console.exe" "LiveSplit/LiveSplit.Tests/bin/Release/LiveSplit.Tests.dll"
35+
run: >
36+
dotnet test
37+
-v m
38+
-c Release
39+
-p:PlatformTarget=x64
40+
-p:GenerateDocumentationFile=false
41+
-p:DebugType=None
42+
.\LiveSplit.sln

0 commit comments

Comments
 (0)