Skip to content

Commit 1fd5e35

Browse files
mediumTajmediumTaj
committed
build: Reenable build and test
1 parent 3022331 commit 1fd5e35

File tree

1 file changed

+130
-130
lines changed

1 file changed

+130
-130
lines changed

‎appveyor.yml‎

Lines changed: 130 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -41,128 +41,128 @@ install:
4141
nuget install -Verbosity quiet -OutputDirectory packages secure-file -ExcludeVersion
4242
4343
before_build:
44-
# - ps: >-
45-
# if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
46-
# {
47-
# git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
48-
# }
44+
- ps: >-
45+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
46+
{
47+
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
48+
}
4949
50-
# dotnet restore
50+
dotnet restore
5151
52-
# build:
53-
# project: IBM.WatsonDeveloperCloud.sln
54-
# verbosity: minimal
55-
# after_build:
56-
# - ps: >-
57-
# git config --global user.email "[email protected]"
58-
# git config --global user.name "Watson Github Bot"
52+
build:
53+
project: IBM.WatsonDeveloperCloud.sln
54+
verbosity: minimal
55+
after_build:
56+
- ps: >-
57+
git config --global user.email "[email protected]"
58+
git config --global user.name "Watson Github Bot"
5959
60-
# if(!$env:APPVEYOR_REPO_TAG_NAME)
60+
if(!$env:APPVEYOR_REPO_TAG_NAME)
6161
62-
# {
63-
# $branchName = $env:APPVEYOR_REPO_BRANCH
64-
# }
62+
{
63+
$branchName = $env:APPVEYOR_REPO_BRANCH
64+
}
6565
66-
# else
66+
else
6767
68-
# {
69-
# $branchName = $env:APPVEYOR_REPO_TAG_NAME
70-
# }
68+
{
69+
$branchName = $env:APPVEYOR_REPO_TAG_NAME
70+
}
7171
72-
# Write-Output "branchName is " + $branchName
72+
Write-Output "branchName is " + $branchName
7373
74-
# if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
75-
# {
74+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
75+
{
7676
77-
# If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "master")
78-
79-
# {
80-
# .\packages\Doxygen.1.8.14\tools\doxygen.exe Doxyfile
81-
82-
# git clone --quiet --branch=gh-pages https://$env:[email protected]/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
83-
84-
# If(Test-Path -Path gh-pages\docs\$branchName)
85-
# {
86-
# rm gh-pages\docs\$branchName -r -force
87-
# }
88-
# mkdir -p gh-pages\docs\$branchName
89-
# mv .\docs\html gh-pages\docs\$branchName
90-
# . .\.utility\generate_html.ps1
91-
# New-TableOfContents ".\gh-pages\docs" | Out-File ".\gh-pages\index.html" -encoding utf8
92-
# cd gh-pages
93-
# git add -f .
94-
# git commit -m "Updated documentation for $branchName"
95-
# git push -f origin gh-pages
96-
# cd ../
97-
# }
98-
99-
# else
100-
101-
# {
102-
# Write-Output "branchName is $branchName. Not generating documentation."
103-
# }
104-
# }
77+
If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "master")
78+
79+
{
80+
.\packages\Doxygen.1.8.14\tools\doxygen.exe Doxyfile
81+
82+
git clone --quiet --branch=gh-pages https://$env:[email protected]/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
83+
84+
If(Test-Path -Path gh-pages\docs\$branchName)
85+
{
86+
rm gh-pages\docs\$branchName -r -force
87+
}
88+
mkdir -p gh-pages\docs\$branchName
89+
mv .\docs\html gh-pages\docs\$branchName
90+
. .\.utility\generate_html.ps1
91+
New-TableOfContents ".\gh-pages\docs" | Out-File ".\gh-pages\index.html" -encoding utf8
92+
cd gh-pages
93+
git add -f .
94+
git commit -m "Updated documentation for $branchName"
95+
git push -f origin gh-pages
96+
cd ../
97+
}
98+
99+
else
100+
101+
{
102+
Write-Output "branchName is $branchName. Not generating documentation."
103+
}
104+
}
105105
106-
# Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
106+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\VisualRecognitionTestData C:\projects\dotnet-standard-sdk\VisualRecognitionTestData
107107
108-
# Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData
108+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\SpeechToTextTestData C:\projects\dotnet-standard-sdk\SpeechToTextTestData
109109
110-
# Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
110+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\DiscoveryTestData C:\projects\dotnet-standard-sdk\DiscoveryTestData
111111
112-
# Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.CompareComply.v1.IT\CompareComplyTestData C:\projects\dotnet-standard-sdk\CompareComplyTestData
112+
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.CompareComply.v1.IT\CompareComplyTestData C:\projects\dotnet-standard-sdk\CompareComplyTestData
113113
test_script:
114114
- ps: >-
115-
# if(Test-Path -Path coverage)
116-
# {
117-
# rm coverage -r -force
118-
# }
115+
if(Test-Path -Path coverage)
116+
{
117+
rm coverage -r -force
118+
}
119119
120-
# New-Item -path . -name coverage -itemtype directory
120+
New-Item -path . -name coverage -itemtype directory
121121
122-
# ForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory))
123-
# {
124-
# if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
125-
# {
126-
# Write-Output \"No pull request number. Executing tests\"
127-
# dotnet test $folder.FullName
128-
# if($LastExitCode -ne 0)
129-
# {
130-
# $host.SetShouldExit($LastExitCode )
131-
# }
132-
# echo \"Test passed: $?\"
133-
# echo \"LastExitCode: $LastExitCode\"
134-
# $openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'
135-
# $targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'
136-
# $filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
137-
# & $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'
138-
139-
# C:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error
140-
141-
# if($env:COVERALLS_REPO_TOKEN)
142-
# {
143-
# C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths
144-
# }
145-
# else
146-
# {
147-
# Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"
148-
# }
149-
# }
150-
# else
151-
# {
152-
# Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping integration tests.\"
153-
154-
# if($folder.FullName.EndsWith("UnitTests"))
155-
# {
156-
# dotnet test $folder.FullName
157-
# if($LastExitCode -ne 0)
158-
# {
159-
# $host.SetShouldExit($LastExitCode )
160-
# }
161-
# echo \"Test passed: $?\"
162-
# echo \"LastExitCode: $LastExitCode\"
163-
# }
164-
# }
165-
# }
122+
ForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory))
123+
{
124+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
125+
{
126+
Write-Output \"No pull request number. Executing tests\"
127+
dotnet test $folder.FullName
128+
if($LastExitCode -ne 0)
129+
{
130+
$host.SetShouldExit($LastExitCode )
131+
}
132+
echo \"Test passed: $?\"
133+
echo \"LastExitCode: $LastExitCode\"
134+
$openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'
135+
$targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'
136+
$filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
137+
& $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'
138+
139+
C:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error
140+
141+
if($env:COVERALLS_REPO_TOKEN)
142+
{
143+
C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths
144+
}
145+
else
146+
{
147+
Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"
148+
}
149+
}
150+
else
151+
{
152+
Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping integration tests.\"
153+
154+
if($folder.FullName.EndsWith("UnitTests"))
155+
{
156+
dotnet test $folder.FullName
157+
if($LastExitCode -ne 0)
158+
{
159+
$host.SetShouldExit($LastExitCode )
160+
}
161+
echo \"Test passed: $?\"
162+
echo \"LastExitCode: $LastExitCode\"
163+
}
164+
}
165+
}
166166
167167
If($branchName -eq "feature-build-on-tag")
168168
@@ -171,24 +171,24 @@ test_script:
171171
npx semantic-release
172172
}
173173
174-
# ElseIf($branchName -eq $env:APPVEYOR_REPO_TAG_NAME)
175-
176-
# {
177-
# Write-Output "branchName is " + $branchName + " - building NuGet packages"
178-
# dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
179-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
180-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.CompareComply.v1\IBM.WatsonDeveloperCloud.CompareComply.v1.csproj --configuration Release
181-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj --configuration Release
182-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj --configuration Release
183-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj --configuration Release
184-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj --configuration Release
185-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.csproj --configuration Release
186-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.csproj --configuration Release
187-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\IBM.WatsonDeveloperCloud.SpeechToText.v1.csproj --configuration Release
188-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1.csproj --configuration Release
189-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj --configuration Release
190-
# dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj --configuration Release
191-
# }
174+
ElseIf($branchName -eq $env:APPVEYOR_REPO_TAG_NAME)
175+
176+
{
177+
Write-Output "branchName is " + $branchName + " - building NuGet packages"
178+
dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
179+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
180+
dotnet pack .\src\IBM.WatsonDeveloperCloud.CompareComply.v1\IBM.WatsonDeveloperCloud.CompareComply.v1.csproj --configuration Release
181+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj --configuration Release
182+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj --configuration Release
183+
dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj --configuration Release
184+
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj --configuration Release
185+
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.csproj --configuration Release
186+
dotnet pack .\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.csproj --configuration Release
187+
dotnet pack .\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\IBM.WatsonDeveloperCloud.SpeechToText.v1.csproj --configuration Release
188+
dotnet pack .\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1.csproj --configuration Release
189+
dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj --configuration Release
190+
dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj --configuration Release
191+
}
192192
193193
194194
artifacts:
@@ -218,11 +218,11 @@ artifacts:
218218
name: IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1
219219
- path: '\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\bin\$(configuration)\*.nupkg'
220220
name: IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1
221-
# deploy:
222-
# - provider: NuGet
223-
# api_key:
224-
# secure: XU1ieXtrgqEHD2XEeyGeHdzgWIl7gDAFc61O0RuQwr/MrYszeeElF6ySKlHNuMAS
225-
# on:
226-
# branch: master
227-
# APPVEYOR_REPO_TAG: true
221+
deploy:
222+
- provider: NuGet
223+
api_key:
224+
secure: XU1ieXtrgqEHD2XEeyGeHdzgWIl7gDAFc61O0RuQwr/MrYszeeElF6ySKlHNuMAS
225+
on:
226+
branch: master
227+
APPVEYOR_REPO_TAG: true
228228

0 commit comments

Comments
 (0)