Skip to content

Commit be44a5f

Browse files
mediumTajmediumTaj
authored
Merge pull request #331 from watson-developer-cloud/feature-build-on-tag
Build on tag
2 parents dd1a1f9 + cc53d94 commit be44a5f

File tree

64 files changed

+146
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+146
-173
lines changed

‎.bumpversion.cfg‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[bumpversion]
22
commit = True
3-
current_version = 2.13.0
3+
current_version = 2.14.0
44
message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
55

66
[bumpversion:file:Doxyfile]
@@ -77,6 +77,8 @@ message = [skip ci] docs: Update version numbers from {current_version} -> {new_
7777

7878
[bumpversion:file:src\IBM.WatsonDeveloperCloud\README.md]
7979

80+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Core.IntegrationTests\IBM.WatsonDeveloperCloud.Core.IntegrationTests.csproj]
81+
8082
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests.csproj]
8183

8284
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests.csproj]

‎.releaserc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"verifyConditions": [],
44
"prepare": [
55
{
6-
"path": "@semantic-release/exec"
6+
"path": "@semantic-release/exec",
7+
"cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
78
}
89
],
910
"publish": ["@semantic-release/github"]

‎.secrets.baseline‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"exclude_regex": null,
3-
"generated_at": "2019-01-31T23:42:02Z",
3+
"generated_at": "2019-02-02T15:16:30Z",
44
"plugins_used": [
55
{
66
"base64_limit": 4.5,
@@ -22,36 +22,6 @@
2222
],
2323
"results": {
2424
"appveyor.yml": [
25-
{
26-
"hashed_secret": "81cc82ec4503a5349cbd49bff33b018dda08791e",
27-
"is_secret": false,
28-
"line_number": 11,
29-
"type": "Base64 High Entropy String"
30-
},
31-
{
32-
"hashed_secret": "fbc5cc2fb172ff872face8cbba0b5c17ac92123a",
33-
"is_secret": false,
34-
"line_number": 13,
35-
"type": "Base64 High Entropy String"
36-
},
37-
{
38-
"hashed_secret": "c7f4f2c1eb2586e68317d0e027e140f3f4aa2ea0",
39-
"is_secret": false,
40-
"line_number": 15,
41-
"type": "Base64 High Entropy String"
42-
},
43-
{
44-
"hashed_secret": "9e1bd5ccb96a264a4b392780dccd7e83b2d4d57f",
45-
"is_secret": false,
46-
"line_number": 17,
47-
"type": "Base64 High Entropy String"
48-
},
49-
{
50-
"hashed_secret": "9ba7161a4cf3d2ed761daa7a5bddae8620bb1d53",
51-
"is_secret": false,
52-
"line_number": 19,
53-
"type": "Base64 High Entropy String"
54-
},
5525
{
5626
"hashed_secret": "c51238bc51c3b0abee7f61d90c414aec89009734",
5727
"is_secret": false,

‎Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "Watson Developer Cloud .NET Standard SDK"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.13.0
41+
PROJECT_NUMBER = 2.14.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎appveyor.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ image: Visual Studio 2017
77
# platform: Any CPU
88
clone_folder: C:\projects\dotnet-standard-sdk
99
environment:
10-
COVERALLS_REPO_TOKEN:
11-
secure: Dnsrk2n+VNE4swcbTLXpfnHwUwTWT8TqMiMkthU6mq/ohNq9dA2rrSA6kdLDBKME
12-
WPS_GITHUB_TOKEN:
13-
secure: J0LjUlYl+lGJMLBcOgVF1m1I07nyr+8yFOMaNBA23RGLMJKvYnRlhmGWXp07ejgu
14-
CRED_SECRET:
15-
secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8=
16-
CREDENTIALS_GITHUB_TOKEN:
17-
secure: gevsMhy8RTWMdf7MjOnIo5QaN6JpL9DPK6I+Go5ByZir5LDwyFsv9hO6nBjGTg8n
18-
GITHUB_TOKEN:
19-
secure: +B2bs86RVtJtlbkB+cTf9bkqnNlFJi/PbBBPzR5jlUlLLZoOc+ZgqgQLwee4tCT+
20-
IBM_CREDENTIALS_FILE: C:\projects\sdk-credentials\ibm-credentials.env
10+
COVERALLS_REPO_TOKEN:
11+
secure: Dnsrk2n+VNE4swcbTLXpfnHwUwTWT8TqMiMkthU6mq/ohNq9dA2rrSA6kdLDBKME #pragma: whitelist secret
12+
WPS_GITHUB_TOKEN:
13+
secure: J0LjUlYl+lGJMLBcOgVF1m1I07nyr+8yFOMaNBA23RGLMJKvYnRlhmGWXp07ejgu #pragma: whitelist secret
14+
CRED_SECRET:
15+
secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8= #pragma: whitelist secret
16+
CREDENTIALS_GITHUB_TOKEN:
17+
secure: gevsMhy8RTWMdf7MjOnIo5QaN6JpL9DPK6I+Go5ByZir5LDwyFsv9hO6nBjGTg8n #pragma: whitelist secret
18+
GITHUB_TOKEN:
19+
secure: +B2bs86RVtJtlbkB+cTf9bkqnNlFJi/PbBBPzR5jlUlLLZoOc+ZgqgQLwee4tCT+ #pragma: whitelist secret
20+
IBM_CREDENTIALS_FILE: C:\projects\sdk-credentials\ibm-credentials.env
2121
install:
2222
# Get the latest stable version of Node.js or io.js
2323
- ps: Install-Product node $env:nodejs_version
@@ -169,13 +169,18 @@ test_script:
169169
If($branchName -eq "master")
170170
171171
{
172+
Write-Output "branchName is master - running semantic release"
172173
npx semantic-release
174+
}
175+
176+
ElseIf($branchName -eq $env:APPVEYOR_REPO_TAG_NAME)
173177
174-
Write-Output "branchName is master - building nuget packages"
178+
{
179+
Write-Output "branchName is " + $branchName + " - building NuGet packages"
175180
dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
176181
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
182+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v2\IBM.WatsonDeveloperCloud.Assistant.v2.csproj --configuration Release
177183
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
179184
dotnet pack .\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj --configuration Release
180185
dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj --configuration Release
181186
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj --configuration Release
@@ -186,22 +191,17 @@ test_script:
186191
dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj --configuration Release
187192
dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj --configuration Release
188193
}
189-
190-
else
191194
192-
{
193-
Write-Output "branchName is not master - do not pack or run semantic-release."
194-
}
195195
196196
artifacts:
197197
- path: '\src\IBM.WatsonDeveloperCloud\bin\$(configuration)\*.nupkg'
198198
name: IBM.WatsonDeveloperCloud
199199
- path: '\src\IBM.WatsonDeveloperCloud.Assistant.v1\bin\$(configuration)\*.nupkg'
200200
name: IBM.WatsonDeveloperCloud.Assistant.v1
201+
- path: '\src\IBM.WatsonDeveloperCloud.Assistant.v2\bin\$(configuration)\*.nupkg'
202+
name: IBM.WatsonDeveloperCloud.Assistant.v2
201203
- path: '\src\IBM.WatsonDeveloperCloud.CompareComply.v1\bin\$(configuration)\*.nupkg'
202204
name: IBM.WatsonDeveloperCloud.CompareComply.v1
203-
- path: '\src\IBM.WatsonDeveloperCloud.Conversation.v1\bin\$(configuration)\*.nupkg'
204-
name: IBM.WatsonDeveloperCloud.Conversation.v1
205205
- path: '\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\bin\$(configuration)\*.nupkg'
206206
name: IBM.WatsonDeveloperCloud.LanguageTranslator.v3
207207
- path: '\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\bin\$(configuration)\*.nupkg'
@@ -223,8 +223,8 @@ artifacts:
223223
deploy:
224224
- provider: NuGet
225225
api_key:
226-
secure: XU1ieXtrgqEHD2XEeyGeHdzgWIl7gDAFc61O0RuQwr/MrYszeeElF6ySKlHNuMAS
226+
secure: q7ya4MDWM5JDI2JYw1DxSKTgX+jwbvdlRKPjVg1Cijxb33r1K5qSAabnsUHcWTLf
227227
on:
228228
branch: master
229229
APPVEYOR_REPO_TAG: true
230-
230+

‎examples/IBM.WatsonDeveloperCloud.Assistant.v2.Example/IBM.WatsonDeveloperCloud.Assistant.v2.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<VersionPrefix>2.13.0</VersionPrefix>
3+
<VersionPrefix>2.14.0</VersionPrefix>
44
<TargetFramework>netcoreapp1.0</TargetFramework>
55
<AssemblyName>IBM.WatsonDeveloperCloud.Conversation.v1.Example</AssemblyName>
66
<OutputType>Exe</OutputType>
@@ -9,7 +9,7 @@
99
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1010
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1111
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
12-
<Version>2.13.0</Version>
12+
<Version>2.14.0</Version>
1313
</PropertyGroup>
1414

1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

‎examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/IBM.WatsonDeveloperCloud.Conversation.v1.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.13.0</VersionPrefix>
4+
<VersionPrefix>2.14.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.Conversation.v1.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.13.0</Version>
13+
<Version>2.14.0</Version>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

‎examples/IBM.WatsonDeveloperCloud.Discovery.v1.Example/IBM.WatsonDeveloperCloud.Discovery.v1.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.13.0</VersionPrefix>
4+
<VersionPrefix>2.14.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.Discovery.v1.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.13.0</Version>
13+
<Version>2.14.0</Version>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

‎examples/IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example/IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.13.0</VersionPrefix>
4+
<VersionPrefix>2.14.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.13.0</Version>
13+
<Version>2.14.0</Version>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

‎examples/IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex/IBM.WatsonDeveloperCloud.NLU.v1.Example.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>2.13.0</VersionPrefix>
4+
<VersionPrefix>2.14.0</VersionPrefix>
55
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex</AssemblyName>
77
<OutputType>Exe</OutputType>
@@ -10,7 +10,7 @@
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1111
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1212
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
13-
<Version>2.13.0</Version>
13+
<Version>2.14.0</Version>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

0 commit comments

Comments
 (0)