Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Ubuntu Appveyor build #1320

Merged
merged 6 commits into from
Aug 27, 2019
Merged

Fix Ubuntu Appveyor build #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1491d4c
try fix appveyor ubuntu build
bergmeister Aug 22, 2019
4c360ad
temporarily enable only ubuntu
bergmeister Aug 22, 2019
225da89
remove redundant linux customisation
bergmeister Aug 22, 2019
9a5c636
fix compatibility analyser build
bergmeister Aug 22, 2019
8224843
final tweak to make it ready for PR
bergmeister Aug 22, 2019
59d1e6f
Update tools/appveyor.psm1
bergmeister Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion PSCompatibilityCollector/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,15 @@ function Invoke-CrossCompatibilityModuleBuild
Push-Location $script:BinModSrcDir
try
{
dotnet publish -f $Framework -c $Configuration
if ( Test-Path "$HOME/.dotnet/dotnet" )
{
$dotnet = "$HOME/.dotnet/dotnet"
}
else
{
$dotnet = "dotnet"
}
& $dotnet publish --framework $Framework --configuration $Configuration
}
finally
{
Expand Down
8 changes: 0 additions & 8 deletions Tests/Engine/CustomizedRule.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ Describe "Test importing correct customized rules" {
It "will show the custom rules when given a glob" {
# needs fixing for Linux
$expectedNumRules = 4
if ($IsLinux)
{
$expectedNumRules = 3
}
$customizedRulePath = Get-ScriptAnalyzerRule -CustomizedRulePath $directory\samplerule\samplerule* | Where-Object {$_.RuleName -match $measure}
$customizedRulePath.Count | Should -Be $expectedNumRules
}
Expand All @@ -113,10 +109,6 @@ Describe "Test importing correct customized rules" {
It "will show the custom rules when given glob with recurse switch" {
# needs fixing for Linux
$expectedNumRules = 5
if ($IsLinux)
{
$expectedNumRules = 4
}
$customizedRulePath = Get-ScriptAnalyzerRule -RecurseCustomRulePath -CustomizedRulePath $directory\samplerule\samplerule* | Where-Object {$_.RuleName -eq $measure}
$customizedRulePath.Count | Should -Be $expectedNumRules
}
Expand Down
1 change: 1 addition & 0 deletions tools/appveyor.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function Invoke-AppVeyorInstall {
Write-Verbose "& $buildScriptDir/build.ps1 -bootstrap"
$buildScriptDir = (Resolve-Path "$PSScriptRoot/..").Path
& "$buildScriptDir/build.ps1" -bootstrap
$Global:LASTEXITCODE = $LASTEXITCODE = 0 # needed to avoid a premature abortion of the AppVeyor Ubuntu build
}

# Implements AppVeyor 'test_script' step
Expand Down