Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2761d6b

Browse files
authored
Simplify ci to 3 parts now that we don't build many fsharp.core.dlls (#3195)
* Simplify ci to 3 parts now that we don't build many fsharp.core.dlls* ci_part1 was still to broad
1 parent0197303 commit2761d6b

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

‎build.cmd‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo Usage:
1919
echo.
2020
echo build.cmd^<all^|net40^|coreclr^|vs^>
2121
echo^<proto^|protofx^>
22-
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|ci_part4^|microbuild^|nuget^>
22+
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|microbuild^|nuget^>
2323
echo^<debug^|release^>
2424
echo^<diag^|publicsign^>
2525
echo^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
@@ -207,19 +207,15 @@ if /i "%ARG%" == "nuget" (
207207
setBUILD_NUGET=1
208208
)
209209

210-
REM These divide "ci" intotwo chunks which can be done in parallel
210+
REM These divide "ci" intothree chunks which can be done in parallel
211211
if /i"%ARG%"=="ci_part1" (
212212
set_autoselect=0
213213

214214
REM what we do
215215
setBUILD_PROTO=1
216216
setBUILD_NET40=1
217-
setBUILD_PROTO_WITH_CORECLR_LKG=1
218217
setBUILD_NET40_FSHARP_CORE=1
219218
setBUILD_VS=1
220-
setBUILD_CORECLR=1
221-
setBUILD_SETUP=%FSC_BUILD_SETUP%
222-
setBUILD_NUGET=1
223219
setTEST_VS_IDEUNIT_SUITE=1
224220
setCI=1
225221
)
@@ -231,7 +227,9 @@ if /i "%ARG%" == "ci_part2" (
231227
setBUILD_PROTO=1
232228
setBUILD_NET40=1
233229
setBUILD_NET40_FSHARP_CORE=1
230+
setTEST_NET40_COMPILERUNIT_SUITE=1
234231
setTEST_NET40_COREUNIT_SUITE=1
232+
setTEST_NET40_FSHARPQA_SUITE=1
235233
setTEST_NET40_FSHARP_SUITE=1
236234
setCI=1
237235
)
@@ -245,24 +243,14 @@ if /i "%ARG%" == "ci_part3" (
245243
setBUILD_CORECLR=1
246244
setBUILD_NET40_FSHARP_CORE=1
247245
setBUILD_NUGET=1
246+
setBUILD_NET40=1
247+
setBUILD_VS=1
248+
setBUILD_SETUP=%FSC_BUILD_SETUP%
248249
setTEST_CORECLR_FSHARP_SUITE=1
249250
setTEST_CORECLR_COREUNIT_SUITE=1
250251
setCI=1
251252
)
252253

253-
if /i"%ARG%"=="ci_part4" (
254-
set_autoselect=0
255-
256-
REM what we do
257-
setBUILD_PROTO=1
258-
setBUILD_NET40=1
259-
setBUILD_NET40_FSHARP_CORE=1
260-
261-
setTEST_NET40_COMPILERUNIT_SUITE=1
262-
setTEST_NET40_FSHARPQA_SUITE=1
263-
setCI=1
264-
)
265-
266254
if /i"%ARG%"=="proto" (
267255
set_autoselect=0
268256
setBUILD_PROTO=1

‎netci.groovy‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def static getBuildJobName(def configuration, def os) {
1212

1313
[true,false].each {isPullRequest->
1414
osList.each {os->
15-
def configurations= ['Debug','Release_ci_part1','Release_ci_part2','Release_ci_part3','Release_ci_part4','Release_net40_no_vs' ];
15+
def configurations= ['Debug','Release_ci_part1','Release_ci_part2','Release_ci_part3','Release_net40_no_vs' ];
1616
if (os!='Windows_NT') {
1717
// Only build one configuration on Linux/... so far
1818
configurations= ['Release'];
@@ -42,9 +42,6 @@ def static getBuildJobName(def configuration, def os) {
4242
elseif (configuration=="Release_ci_part3") {
4343
build_args="ci_part3"
4444
}
45-
elseif (configuration=="Release_ci_part4") {
46-
build_args="ci_part4"
47-
}
4845
elseif (configuration=="Release_net40_no_vs") {
4946
build_args="net40"
5047
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp