Skip to content

Commit 9a8595d

Browse files
committed
Merge branch '506v2'
2 parents 00a6f16 + 1a807e9 commit 9a8595d

721 files changed

Lines changed: 45231 additions & 48467 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 3 additions & 589 deletions
Large diffs are not rendered by default.

.github/workflows/build.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
name: Build
1+
name: Build and test RTCV
22
on: [push, pull_request]
33

44
jobs:
5-
build:
5+
buildAndTest:
66
runs-on: windows-2019
77
steps:
88
- uses: actions/checkout@v1
9-
- name: Setup Nuget
10-
uses: nuget/setup-nuget@v1.0.2
11-
with:
12-
nuget-version: 'latest'
13-
- name: Restore packages
14-
run: nuget restore RTCV.sln
159
- name: Setup MSBuild.exe
16-
uses: microsoft/setup-msbuild@v1.0.0
10+
uses: microsoft/setup-msbuild@v1.0.2
11+
- name: Restore packages
12+
run: msbuild RTCV.sln /t:restore
1713
- name: Build with MSBuild
1814
run: msbuild RTCV.sln
15+
- name: Run tests
16+
run: dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
17+
- name: Report coverage to codecov
18+
uses: codecov/codecov-action@v1.0.13
19+
with:
20+
file: Tests/coverage.opencover.xml

.github/workflows/buildConsumers.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.
Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
name: Build dependants
2+
on:
3+
push:
4+
branches:
5+
- '506v2'
6+
pull_request:
7+
branches:
8+
- '506v2'
9+
10+
jobs:
11+
Bizhawk:
12+
runs-on: windows-2019
13+
steps:
14+
# Checkout relevant code
15+
- name: Checkout current build target
16+
uses: actions/checkout@v2
17+
with:
18+
path: 'RTCV'
19+
- name: Checkout Bizhawk
20+
uses: actions/checkout@v2
21+
with:
22+
repository: 'redscientistlabs/Bizhawk-Vanguard'
23+
ref: 'master'
24+
path: 'Bizhawk-Vanguard'
25+
26+
# Setup Tooling
27+
- name: Setup MSBuild.exe
28+
uses: microsoft/setup-msbuild@v1.0.2
29+
30+
# Restore packages for all targets
31+
- name: Restore packages in current build target
32+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
33+
- name: Restore packages in Bizhawk
34+
run: msbuild /t:restore '.\Bizhawk-Vanguard\Real-Time Corruptor\BizHawk_RTC\BizHawk.sln'
35+
36+
# Build Bizhawk
37+
- name: Build Bizhawk-Vanguard
38+
run: msbuild '.\Bizhawk-Vanguard\Real-Time Corruptor\BizHawk_RTC\BizHawk.sln'
39+
40+
FileStub:
41+
runs-on: windows-2019
42+
steps:
43+
# Checkout relevant code
44+
- name: Checkout current build target
45+
uses: actions/checkout@v2
46+
with:
47+
path: 'RTCV'
48+
- name: Checkout FileStub
49+
uses: actions/checkout@v2
50+
with:
51+
repository: 'redscientistlabs/FileStub-Vanguard'
52+
ref: 'master'
53+
path: 'FileStub-Vanguard'
54+
55+
# Setup Tooling
56+
- name: Setup MSBuild.exe
57+
uses: microsoft/setup-msbuild@v1.0.2
58+
59+
# Restore packages for all targets
60+
- name: Restore packages in current build target
61+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
62+
- name: Restore packages in FileStub
63+
run: msbuild /t:restore '.\FileStub-Vanguard\FileStub-Vanguard.sln'
64+
65+
# Build FileStub
66+
- name: Build FileStub-Vanguard
67+
run: msbuild '.\FileStub-Vanguard\FileStub-Vanguard.sln'
68+
69+
ProcessStub:
70+
runs-on: windows-2019
71+
steps:
72+
# Checkout relevant code
73+
- name: Checkout current build target
74+
uses: actions/checkout@v2
75+
with:
76+
path: 'RTCV'
77+
- name: Checkout ProcessStub
78+
uses: actions/checkout@v2
79+
with:
80+
repository: 'redscientistlabs/ProcessStub-Vanguard'
81+
ref: 'master'
82+
path: 'ProcessStub-Vanguard'
83+
84+
# Setup Tooling
85+
- name: Setup MSBuild.exe
86+
uses: microsoft/setup-msbuild@v1.0.2
87+
88+
# Restore packages for all targets
89+
- name: Restore packages in current build target
90+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
91+
- name: Restore packages in ProcessStub
92+
run: msbuild /t:restore '.\ProcessStub-Vanguard\ProcessStub-Vanguard.sln'
93+
94+
# Build ProcessStub
95+
- name: Build ProcessStub-Vanguard
96+
run: msbuild '.\ProcessStub-Vanguard\ProcessStub-Vanguard.sln'
97+
98+
melonDS:
99+
runs-on: windows-2019
100+
steps:
101+
# Setup tooling
102+
- name: Setup MSBuild.exe
103+
uses: microsoft/setup-msbuild@v1.0.2
104+
105+
# Setup RTCV
106+
- name: Checkout current build target
107+
uses: actions/checkout@v2
108+
with:
109+
path: 'RTCV'
110+
- name: Restore packages in RTCV
111+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
112+
- name: Build RTCV
113+
run: msbuild '.\RTCV\RTCV.sln'
114+
115+
# Build melonDS
116+
- name: Checkout melonDS-Vanguard
117+
uses: actions/checkout@v2
118+
with:
119+
repository: 'redscientistlabs/melonDS-Vanguard'
120+
ref: 'Vanguard'
121+
path: 'melonDS-Vanguard'
122+
- name: Create build directory
123+
run: |
124+
New-Item -ItemType directory -Path ${{runner.workspace}}\RTCV\melonDS-Vanguard\build
125+
- name: Configure
126+
run: |
127+
cd ${{runner.workspace}}\RTCV\melonDS-Vanguard\build
128+
cmake .. -DENABLE_LTO=false -DDONT_COPY_FIRMWARE=true -DDONT_BUILD_EXTRA_SDL_CODE=true -DCI_BUILD_SHARED_LIBS=true -DCI_INCLUDE_EXTRA_LIBUI_LIBS=true
129+
- name: Build melonDS-Vanguard
130+
run: |
131+
cd ${{runner.workspace}}\RTCV\melonDS-Vanguard\build
132+
msbuild melonDS.sln
133+
134+
dolphin:
135+
runs-on: windows-2019
136+
steps:
137+
- name: Checkout dolphin
138+
uses: actions/checkout@v2
139+
with:
140+
repository: 'redscientistlabs/dolphin-vanguard'
141+
ref: 'Vanguard'
142+
path: 'dolphin-vanguard'
143+
submodules: 'true'
144+
- name: Checkout current build target
145+
uses: actions/checkout@v2
146+
with:
147+
path: 'RTCV'
148+
- name: Setup MSBuild.exe
149+
uses: microsoft/setup-msbuild@v1.0.2
150+
- name: Restore packages in RTCV
151+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
152+
- name: Restore packages in dolphin-vanguard
153+
run: msbuild /t:restore '.\dolphin-vanguard\Source\dolphin-emu.sln'
154+
- name: Build with MSBuild
155+
run: msbuild '.\dolphin-vanguard\Source\dolphin-emu.sln' /property:Configuration=Release /property:Platform=x64 /p:TreatWarningAsError=false
156+
157+
pcsx2:
158+
runs-on: windows-2019
159+
steps:
160+
- name: Checkout pcsx2
161+
uses: actions/checkout@v2
162+
with:
163+
repository: 'redscientistlabs/pcsx2-Vanguard'
164+
ref: 'Vanguard'
165+
path: 'pcsx2-Vanguard'
166+
submodules: 'recursive'
167+
- name: Checkout current build target
168+
uses: actions/checkout@v2
169+
with:
170+
path: 'RTCV'
171+
- name: Setup MSBuild.exe
172+
uses: microsoft/setup-msbuild@v1.0.2
173+
- name: Restore packages in RTCV
174+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
175+
- name: Restore packages in pcsx2-Vanguard
176+
run: msbuild /t:restore '.\pcsx2-Vanguard\PCSX2_suite.sln'
177+
- name: Build with MSBuild
178+
run: msbuild '.\pcsx2-Vanguard\PCSX2_suite.sln' /property:Configuration=Debug /property:Platform=Win32
179+
180+
citra:
181+
runs-on: windows-2019
182+
steps:
183+
# RTCV
184+
- name: Checkout current build target
185+
uses: actions/checkout@v2
186+
with:
187+
path: 'RTCV'
188+
- name: Setup MSBuild.exe
189+
uses: microsoft/setup-msbuild@v1.0.2
190+
- name: Restore packages in RTCV
191+
run: msbuild /t:restore '.\RTCV\RTCV.sln'
192+
- name: Build RTCV
193+
run: msbuild '.\RTCV\RTCV.sln'
194+
195+
# citra
196+
- name: Checkout citra
197+
uses: actions/checkout@v2
198+
with:
199+
repository: 'redscientistlabs/citra-vanguard'
200+
ref: 'vanguard'
201+
path: 'citra-vanguard'
202+
submodules: 'recursive'
203+
- name: Create Citra build directory
204+
working-directory: ${{runner.workspace}}\RTCV\citra-vanguard
205+
run: New-Item -ItemType Directory -Path build
206+
- name: Citra prebuild
207+
run: |
208+
cd citra-vanguard\build
209+
cmake .. -DCITRA_DONT_BUILD_DEDICATED_ROOM=true -DCITRA_DONT_BUILD_TESTS=true -DENABLE_SDL2=false -DCITRA_USE_BUNDLED_QT=1
210+
- name: Citra build
211+
run: |
212+
cd citra-vanguard\build
213+
msbuild citra.sln

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ build
1010
Output/*
1111
StyleCop.Cache
1212
.vscode
13+
14+
# Coverage output
15+
**/lcov.info
16+
coverage.json
17+
*.opencover.xml

Assets/Deprecated modules/Classic AutoKillSwitch/AutoKillSwitch.sln

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)