Skip to content

Commit 0ea7077

Browse files
mediumTajmediumTaj
authored
Merge pull request #326 from watson-developer-cloud/hotfix-ci
ci: Updated NuGet apikey, moved semantic-release after tests
2 parents 84fa3f0 + d27815d commit 0ea7077

File tree

2 files changed

+83
-81
lines changed

2 files changed

+83
-81
lines changed

‎.secrets.baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"exclude_regex": null,
3-
"generated_at": "2019-01-08T20:42:05Z",
3+
"generated_at": "2019-01-16T21:44:14Z",
44
"plugins_used": [
55
{
66
"base64_limit": 4.5,
@@ -61,7 +61,7 @@
6161
{
6262
"hashed_secret": "3f820839b94508b2a9dc3b3e6e1149080af8780c",
6363
"is_secret": false,
64-
"line_number": 82,
64+
"line_number": 84,
6565
"type": "Basic Auth Credentials"
6666
}
6767
]

‎appveyor.yml‎

Lines changed: 81 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ build:
5454
verbosity: minimal
5555
after_build:
5656
- ps: >-
57+
$env:Path = $env:Path + ";" + $HOME + "\AppData\Roaming\Python\Python37\Scripts"
58+
$env:Path = "C:\Python$env:PYTHON\;C:\Python$env:PYTHON\Scripts\;$env:Path"
5759
git config --global user.email "[email protected]"
5860
git config --global user.name "Watson Github Bot"
5961
@@ -94,34 +96,6 @@ after_build:
9496
git commit -m "Updated documentation for $branchName"
9597
git push -f origin gh-pages
9698
cd ../
97-
98-
If($branchName -eq "master")
99-
100-
{
101-
npx semantic-release
102-
103-
Write-Output "branchName is master - building nuget packages"
104-
dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
105-
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
106-
dotnet pack .\src\IBM.WatsonDeveloperCloud.CompareComply.v1\IBM.WatsonDeveloperCloud.CompareComply.v1.csproj --configuration Release
107-
dotnet pack .\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj --configuration Release
108-
dotnet pack .\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj --configuration Release
109-
dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj --configuration Release
110-
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj --configuration Release
111-
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.csproj --configuration Release
112-
dotnet pack .\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.csproj --configuration Release
113-
dotnet pack .\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\IBM.WatsonDeveloperCloud.SpeechToText.v1.csproj --configuration Release
114-
dotnet pack .\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1.csproj --configuration Release
115-
dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj --configuration Release
116-
dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj --configuration Release
117-
}
118-
119-
else
120-
121-
{
122-
Write-Output "branchName is not master - do not pack or run semantic-release."
123-
}
124-
12599
}
126100
127101
else
@@ -140,57 +114,85 @@ after_build:
140114
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.CompareComply.v1.IT\CompareComplyTestData C:\projects\dotnet-standard-sdk\CompareComplyTestData
141115
test_script:
142116
- ps: >-
143-
if(Test-Path -Path coverage)
144-
{
145-
rm coverage -r -force
146-
}
117+
if(Test-Path -Path coverage)
118+
{
119+
rm coverage -r -force
120+
}
121+
122+
New-Item -path . -name coverage -itemtype directory
123+
124+
ForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory))
125+
{
126+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
127+
{
128+
Write-Output \"No pull request number. Executing tests\"
129+
dotnet test $folder.FullName
130+
if($LastExitCode -ne 0)
131+
{
132+
$host.SetShouldExit($LastExitCode )
133+
}
134+
echo \"Test passed: $?\"
135+
echo \"LastExitCode: $LastExitCode\"
136+
$openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'
137+
$targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'
138+
$filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
139+
& $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'
140+
141+
C:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error
142+
143+
if($env:COVERALLS_REPO_TOKEN)
144+
{
145+
C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths
146+
}
147+
else
148+
{
149+
Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"
150+
}
151+
}
152+
else
153+
{
154+
Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping integration tests.\"
155+
156+
if($folder.FullName.EndsWith("UnitTests"))
157+
{
158+
dotnet test $folder.FullName
159+
if($LastExitCode -ne 0)
160+
{
161+
$host.SetShouldExit($LastExitCode )
162+
}
163+
echo \"Test passed: $?\"
164+
echo \"LastExitCode: $LastExitCode\"
165+
}
166+
}
167+
}
168+
169+
If($branchName -eq "master")
170+
171+
{
172+
npx semantic-release
173+
174+
Write-Output "branchName is master - building nuget packages"
175+
dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
176+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
177+
dotnet pack .\src\IBM.WatsonDeveloperCloud.CompareComply.v1\IBM.WatsonDeveloperCloud.CompareComply.v1.csproj --configuration Release
178+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj --configuration Release
179+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj --configuration Release
180+
dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj --configuration Release
181+
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj --configuration Release
182+
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.csproj --configuration Release
183+
dotnet pack .\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.csproj --configuration Release
184+
dotnet pack .\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\IBM.WatsonDeveloperCloud.SpeechToText.v1.csproj --configuration Release
185+
dotnet pack .\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1.csproj --configuration Release
186+
dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj --configuration Release
187+
dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj --configuration Release
188+
}
189+
190+
else
191+
192+
{
193+
Write-Output "branchName is not master - do not pack or run semantic-release."
194+
}
147195
148-
New-Item -path . -name coverage -itemtype directory
149-
150-
ForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory))
151-
{
152-
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
153-
{
154-
Write-Output \"No pull request number. Executing tests\"
155-
dotnet test $folder.FullName
156-
if($LastExitCode -ne 0)
157-
{
158-
$host.SetShouldExit($LastExitCode )
159-
}
160-
echo \"Test passed: $?\"
161-
echo \"LastExitCode: $LastExitCode\"
162-
$openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'
163-
$targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'
164-
$filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
165-
& $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'
166-
167-
C:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error
168-
169-
if($env:COVERALLS_REPO_TOKEN)
170-
{
171-
C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths
172-
}
173-
else
174-
{
175-
Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"
176-
}
177-
}
178-
else
179-
{
180-
Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping integration tests.\"
181-
182-
if($folder.FullName.EndsWith("UnitTests"))
183-
{
184-
dotnet test $folder.FullName
185-
if($LastExitCode -ne 0)
186-
{
187-
$host.SetShouldExit($LastExitCode )
188-
}
189-
echo \"Test passed: $?\"
190-
echo \"LastExitCode: $LastExitCode\"
191-
}
192-
}
193-
}
194196
artifacts:
195197
- path: '\src\IBM.WatsonDeveloperCloud\bin\$(configuration)\*.nupkg'
196198
name: IBM.WatsonDeveloperCloud
@@ -221,7 +223,7 @@ artifacts:
221223
deploy:
222224
- provider: NuGet
223225
api_key:
224-
secure: jVMsvYb86JW+UMN2Gb2m1JazRkouGMzd58NHWxWVAY1BsQbehIU+YTxdsAeMo1qy
226+
secure: XU1ieXtrgqEHD2XEeyGeHdzgWIl7gDAFc61O0RuQwr/MrYszeeElF6ySKlHNuMAS
225227
on:
226228
branch: master
227229
APPVEYOR_REPO_TAG: true

0 commit comments

Comments
 (0)