Skip to content

Commit 97df8b2

Browse files
committed
build: Restore appveyor yml and add -q to commands in powershell
1 parent d907216 commit 97df8b2

File tree

2 files changed

+33
-45
lines changed

2 files changed

+33
-45
lines changed

.bumpversion.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ commit = True
33
current_version = 4.2.1
44
message = docs: Update version numbers from {current_version} -> {new_version}
55

6+
[bumpversion:file:appveyor.yml]
7+
search = {current_version}
8+
replace = {new_version}
9+
610
[bumpversion:file:Doxyfile]
711
search = {current_version}
812
replace = {new_version}

appveyor.yml

Lines changed: 29 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 4.3.0.{build}
1+
version: 4.2.1.{build}
22
branches:
33
except:
44
- gh-pages
@@ -14,7 +14,7 @@ environment:
1414
CRED_SECRET:
1515
secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8= #pragma: whitelist secret
1616
CREDENTIALS_GITHUB_TOKEN:
17-
secure: Zkh0ZB9E5PB/Kq5maKln+aKSH0xqDjR2LTDaJRmMaUYVOV7nzYsON4KlkqCKCgGs #pragma: whitelist secret
17+
secure: gevsMhy8RTWMdf7MjOnIo5QaN6JpL9DPK6I+Go5ByZir5LDwyFsv9hO6nBjGTg8n #pragma: whitelist secret
1818
GITHUB_TOKEN:
1919
secure: +B2bs86RVtJtlbkB+cTf9bkqnNlFJi/PbBBPzR5jlUlLLZoOc+ZgqgQLwee4tCT+ #pragma: whitelist secret
2020
IBM_CREDENTIALS_FILE: C:\projects\sdk-credentials\ibm-credentials.env
@@ -49,11 +49,9 @@ before_build:
4949
- ps: >-
5050
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
5151
{
52-
Write-Output "APPVEYOR_PULL_REQUEST_NUMBER is null, cloning credentials."
53-
54-
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials
52+
git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials -q
5553
}
56-
54+
5755
dotnet restore
5856
5957
build:
@@ -234,65 +232,51 @@ test_script:
234232
235233
}
236234
237-
after_test:
238-
SET BRANCH_NAME=%APPVEYOR_REPO_TAG_NAME%
235+
If($branchName -eq "master" -and $env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
239236
237+
{
238+
239+
Write-Output "branchName is master and not a pull request - running semantic release"
240240
241-
IF NOT BRANCH_NAME=="master" (
241+
242242
243-
ECHO "BRANCH_NAME is master"
243+
}
244244
245-
IF NOT DEFINED APPVEYOR_PULL_REQUEST_NUMBER (
245+
ElseIf($branchName -eq $env:APPVEYOR_REPO_TAG_NAME)
246246
247-
ECHO "APPVEYOR_PULL_REQUEST_NUMBER is not defined, running semantic release"
247+
{
248+
Write-Output "branchName is " + $branchName + " - building NuGet packages"
248249
249-
250+
dotnet pack .\src\IBM.Watson.Assistant.v1\IBM.Watson.Assistant.v1.csproj --configuration Release
250251
251-
) ELSE (
252+
dotnet pack .\src\IBM.Watson.Assistant.v2\IBM.Watson.Assistant.v2.csproj --configuration Release
252253
253-
ECHO "APPVEYOR_PULL_REQUEST_NUMBER is %APPVEYOR_PULL_REQUEST_NUMBER%, not running semantic release"
254+
dotnet pack .\src\IBM.Watson.CompareComply.v1\IBM.Watson.CompareComply.v1.csproj --configuration Release
254255
255-
)
256+
dotnet pack .\src\IBM.Watson.Discovery.v1\IBM.Watson.Discovery.v1.csproj --configuration Release
256257
257-
) ELSE (
258+
dotnet pack .\src\IBM.Watson.Discovery.v2\IBM.Watson.Discovery.v2.csproj --configuration Release
258259
259-
ECHO "BRANCH_NAME is not master - BRANCH_NAME is %BRANCH_NAME%, not running semantic release"
260+
dotnet pack .\src\IBM.Watson.LanguageTranslator.v3\IBM.Watson.LanguageTranslator.v3.csproj --configuration Release
260261
261-
IF BRANCH_NAME==%APPVEYOR_REPO_TAG_NAME% (
262+
dotnet pack .\src\IBM.Watson.NaturalLanguageClassifier.v1\IBM.Watson.NaturalLanguageClassifier.v1.csproj --configuration Release
262263
263-
ECHO "BRANCH_NAME is a tag is %APPVEYOR_PULL_REQUEST_NUMBER%. Building Nuget packages"
264+
dotnet pack .\src\IBM.Watson.NaturalLanguageUnderstanding.v1\IBM.Watson.NaturalLanguageUnderstanding.v1.csproj --configuration Release
264265
265-
dotnet pack .\src\IBM.Watson.Assistant.v1\IBM.Watson.Assistant.v1.csproj --configuration Release
266+
dotnet pack .\src\IBM.Watson.PersonalityInsights.v3\IBM.Watson.PersonalityInsights.v3.csproj --configuration Release
266267
267-
dotnet pack .\src\IBM.Watson.Assistant.v2\IBM.Watson.Assistant.v2.csproj --configuration Release
268+
dotnet pack .\src\IBM.Watson.SpeechToText.v1\IBM.Watson.SpeechToText.v1.csproj --configuration Release
268269
269-
dotnet pack .\src\IBM.Watson.CompareComply.v1\IBM.Watson.CompareComply.v1.csproj --configuration Release
270+
dotnet pack .\src\IBM.Watson.TextToSpeech.v1\IBM.Watson.TextToSpeech.v1.csproj --configuration Release
270271
271-
dotnet pack .\src\IBM.Watson.Discovery.v1\IBM.Watson.Discovery.v1.csproj --configuration Release
272+
dotnet pack .\src\IBM.Watson.ToneAnalyzer.v3\IBM.Watson.ToneAnalyzer.v3.csproj --configuration Release
272273
273-
dotnet pack .\src\IBM.Watson.Discovery.v2\IBM.Watson.Discovery.v2.csproj --configuration Release
274+
dotnet pack .\src\IBM.Watson.VisualRecognition.v3\IBM.Watson.VisualRecognition.v3.csproj --configuration Release
274275
275-
dotnet pack .\src\IBM.Watson.LanguageTranslator.v3\IBM.Watson.LanguageTranslator.v3.csproj --configuration Release
276+
dotnet pack .\src\IBM.Watson.VisualRecognition.v4\IBM.Watson.VisualRecognition.v4.csproj --configuration Release
276277
277-
dotnet pack .\src\IBM.Watson.NaturalLanguageClassifier.v1\IBM.Watson.NaturalLanguageClassifier.v1.csproj --configuration Release
278-
279-
dotnet pack .\src\IBM.Watson.NaturalLanguageUnderstanding.v1\IBM.Watson.NaturalLanguageUnderstanding.v1.csproj --configuration Release
280-
281-
dotnet pack .\src\IBM.Watson.PersonalityInsights.v3\IBM.Watson.PersonalityInsights.v3.csproj --configuration Release
282-
283-
dotnet pack .\src\IBM.Watson.SpeechToText.v1\IBM.Watson.SpeechToText.v1.csproj --configuration Release
284-
285-
dotnet pack .\src\IBM.Watson.TextToSpeech.v1\IBM.Watson.TextToSpeech.v1.csproj --configuration Release
286-
287-
dotnet pack .\src\IBM.Watson.ToneAnalyzer.v3\IBM.Watson.ToneAnalyzer.v3.csproj --configuration Release
288-
289-
dotnet pack .\src\IBM.Watson.VisualRecognition.v3\IBM.Watson.VisualRecognition.v3.csproj --configuration Release
290-
291-
dotnet pack .\src\IBM.Watson.VisualRecognition.v4\IBM.Watson.VisualRecognition.v4.csproj --configuration Release
278+
}
292279
293-
)
294-
295-
)
296280
297281
artifacts:
298282
- path: '\src\IBM.Watson.Assistant.v1\bin\$(configuration)\*.nupkg'
@@ -330,4 +314,4 @@ deploy:
330314
on:
331315
branch: master
332316
APPVEYOR_REPO_TAG: true
333-
317+

0 commit comments

Comments
 (0)