Commit19ce02d

authored

Allow sudo on CI Ubuntu to install latest Mono (dotnet#4382)

* rejig mono scripts* upates to ci* upates to ci* upates to ci* use outer-latest for sudo* fix scripts

1 parent929b8c3 commit19ce02dCopy full SHA for 19ce02d

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`	`3`	`# note: expects to run from top directory`
`4`		`-../mono/latest-mono-stable.sh&& \`
	`4`	`+./mono/latest-mono-stable.sh&& \`
`5`	`5`	`./build.sh NuGet`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`	`3`	`# note: expects to run from top directory`
`4`		`-# suitable for Ubuntu 16.04 - get latest Mono stable`
`5`		`-../mono/latest-mono-stable.sh&& \`
	`4`	`+./mono/latest-mono-stable.sh&& \`
`6`	`5`	`make Configuration=$@&& \`
`7`	`6`	`sudo make install Configuration=$@&& \`
`8`		`-../mono/test-mono.sh`
	`7`	`+./mono/test-mono.sh`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ def static getBuildJobName(def configuration, def os) {`
`97`	`97`	`def skipIfNoTestFiles=true`
`98`	`98`	`def skipIfNoBuildOutput=false`
`99`	`99`
`100`		`-def affinity= configuration=='Release_net40_no_vs'?'latest-or-auto': (os=='Windows_NT'?'latest-dev15-5':'latest-or-auto')`
	`100`	`+// "sudo is not enabled by default on most of the VM images. The outerloop images do have this enabled. The image version (usually 'latest') can be set to 'outer-latest' in this case to enable passwordless sudo, which would enable your scenario."`
	`101`	`+// https://github.com/Microsoft/visualfsharp/pull/4372#issuecomment-367850885`
	`102`	`+def affinity= (configuration=='Release_net40_no_vs'?'latest-or-auto': (os=='Windows_NT'?'latest-dev15-5':'outer-latest'))`
`101`	`103`	`Utilities.setMachineAffinity(newJob, os, affinity)`
`102`	`104`	`Utilities.standardJobSetup(newJob, project, isPullRequest,"*/${branch}")`
`103`	`105`

Comments

(0)