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

Commite0203f0

Browse files
authored
rejig netci.groovy (dotnet#4377)
* rejig mono scripts* Update netci.groovy
1 parent0bdad51 commite0203f0

File tree

4 files changed

+34
-19
lines changed

4 files changed

+34
-19
lines changed

‎fcs/cibuild.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
# suitable for Ubuntu 16.04 - get latest Mono stable
4+
../mono/latest-mono-stable.sh
5+
./build.sh NuGet

‎mono/cimake.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
# suitable for Ubuntu 16.04 - get latest Mono stable
4+
../mono/latest-mono-stable.sh
5+
make$@

‎mono/latest-mono-stable.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
# suitable for Ubuntu 16.04 - get latest Mono stable
4+
mono --version
5+
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
6+
echo"deb http://download.mono-project.com/repo/ubuntu stable-xenial main"| sudo tee /etc/apt/sources.list.d/mono-official-stable.list
7+
sudo apt-get update
8+
ps -A| grep apt
9+
#sudo rm /var/lib/dpkg/lock
10+
#sudo dpkg --configure -a
11+
sudo apt-get -my install mono-devel
12+
mono --version

‎netci.groovy‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,60 +30,53 @@ def static getBuildJobName(def configuration, def os) {
3030
def buildCommand='';
3131
def buildOutput='';
3232
def buildArgs='';
33-
def getMono='''
34-
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
35-
echo "deb http://download.mono-project.com/repo/ubuntu stable-trusty main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
36-
sudo apt-get update
37-
sudo apt-get -my install mono-devel
38-
mono --version
39-
'''
4033

4134
if (configuration=="Release_fcs"&& branch!="dev15.5") {
4235
// Build and test FCS NuGet package
43-
buildOutput="Release"
36+
buildOutput="release"
4437
if (os=='Windows_NT') {
4538
buildCommand=".\\fcs\\build.cmd TestAndNuget"
4639
}
4740
else {
48-
buildCommand=getMono+"./fcs/build.sh Build"
41+
buildCommand="./fcs/cibuild.sh Build"
4942
}
5043
}
5144
elseif (configuration=="Debug_default") {
52-
buildOutput="Debug"
45+
buildOutput="debug"
5346
if (os=='Windows_NT') {
5447
buildCommand="build.cmd debug"
5548
}
5649
else {
57-
buildCommand=getMono+"make Configuration=Debug"
50+
buildCommand="./mono/cimake.sh install Configuration=Debug"
5851
}
5952
}
6053
elseif (configuration=="Release_default") {
61-
buildOutput="Release"
54+
buildOutput="release"
6255
if (os=='Windows_NT') {
6356
buildCommand="build.cmd release"
6457
}
6558
else {
66-
buildCommand=getMono+"make Configuration=Release"
59+
buildCommand="./mono/cimake.sh install Configuration=Release"
6760
}
6861
}
6962
elseif (configuration=="Release_net40_test") {
70-
buildOutput="Release"
63+
buildOutput="release"
7164
buildCommand="build.cmd release net40 test"
7265
}
7366
elseif (configuration=="Release_ci_part1") {
74-
buildOutput="Release"
67+
buildOutput="release"
7568
buildCommand="build.cmd release ci_part1"
7669
}
7770
elseif (configuration=="Release_ci_part2") {
78-
buildOutput="Release"
71+
buildOutput="release"
7972
buildCommand="build.cmd release ci_part2"
8073
}
8174
elseif (configuration=="Release_ci_part3") {
82-
buildOutput="Release"
75+
buildOutput="release"
8376
buildCommand="build.cmd release ci_part3"
8477
}
8578
elseif (configuration=="Release_net40_no_vs") {
86-
buildOutput="Release"
79+
buildOutput="release"
8780
buildCommand="build.cmd release net40"
8881
}
8982

@@ -108,7 +101,7 @@ mono --version
108101
Utilities.standardJobSetup(newJob, project, isPullRequest,"*/${branch}")
109102

110103
Utilities.addArchival(newJob,"tests/TestResults/*.*","", skipIfNoTestFiles,false)
111-
Utilities.addArchival(newJob,"${buildOutput}/**")
104+
Utilities.addArchival(newJob,"${buildOutput}/**", skipIfNoBuildOutput,false)
112105
if (isPullRequest) {
113106
Utilities.addGithubPRTriggerForBranch(newJob, branch,"${os}${configuration} Build")
114107
}

0 commit comments

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