Skip to content

Commit 324df0c

Browse files
kevinkowakevinkowa
authored
Merge pull request #486 from watson-developer-cloud/release-03-2022
Release 03 2022
2 parents 3a4be08 + b1afb49 commit 324df0c

File tree

305 files changed

+2246
-19180
lines changed

Some content is hidden

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

305 files changed

+2246
-19180
lines changed

‎.bumpversion.cfg‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ replace = {new_version}
1515
search = {current_version}
1616
replace = {new_version}
1717

18-
[bumpversion:file:src/IBM.Watson.CompareComply.v1/IBM.Watson.CompareComply.v1.csproj]
19-
search = {current_version}
20-
replace = {new_version}
21-
2218
[bumpversion:file:src/IBM.Watson.Discovery.v1/IBM.Watson.Discovery.v1.csproj]
2319
search = {current_version}
2420
replace = {new_version}
@@ -31,18 +27,10 @@ replace = {new_version}
3127
search = {current_version}
3228
replace = {new_version}
3329

34-
[bumpversion:file:src/IBM.Watson.NaturalLanguageClassifier.v1/IBM.Watson.NaturalLanguageClassifier.v1.csproj]
35-
search = {current_version}
36-
replace = {new_version}
37-
3830
[bumpversion:file:src/IBM.Watson.NaturalLanguageUnderstanding.v1/IBM.Watson.NaturalLanguageUnderstanding.v1.csproj]
3931
search = {current_version}
4032
replace = {new_version}
4133

42-
[bumpversion:file:src/IBM.Watson.PersonalityInsights.v3/IBM.Watson.PersonalityInsights.v3.csproj]
43-
search = {current_version}
44-
replace = {new_version}
45-
4634
[bumpversion:file:src/IBM.Watson.SpeechToText.v1/IBM.Watson.SpeechToText.v1.csproj]
4735
search = {current_version}
4836
replace = {new_version}
@@ -51,18 +39,6 @@ replace = {new_version}
5139
search = {current_version}
5240
replace = {new_version}
5341

54-
[bumpversion:file:src/IBM.Watson.ToneAnalyzer.v3/IBM.Watson.ToneAnalyzer.v3.csproj]
55-
search = {current_version}
56-
replace = {new_version}
57-
58-
[bumpversion:file:src/IBM.Watson.VisualRecognition.v3/IBM.Watson.VisualRecognition.v3.csproj]
59-
search = {current_version}
60-
replace = {new_version}
61-
62-
[bumpversion:file:src/IBM.Watson.VisualRecognition.v4/IBM.Watson.VisualRecognition.v4.csproj]
63-
search = {current_version}
64-
replace = {new_version}
65-
6642
[bumpversion:file:src/IBM.Watson.Assistant.v1/Test/Integration/IBM.Watson.Assistant.v1.IntegrationTests.csproj]
6743
search = {current_version}
6844
replace = {new_version}
@@ -79,14 +55,6 @@ replace = {new_version}
7955
search = {current_version}
8056
replace = {new_version}
8157

82-
[bumpversion:file:src/IBM.Watson.CompareComply.v1/Test/Integration/IBM.Watson.CompareComply.v1.IntegrationTests.csproj]
83-
search = {current_version}
84-
replace = {new_version}
85-
86-
[bumpversion:file:src/IBM.Watson.CompareComply.v1/Test/Unit/IBM.Watson.CompareComply.v1.UnitTests.csproj]
87-
search = {current_version}
88-
replace = {new_version}
89-
9058
[bumpversion:file:src/IBM.Watson.Discovery.v1/Test/Integration/IBM.Watson.Discovery.v1.IntegrationTests.csproj]
9159
search = {current_version}
9260
replace = {new_version}
@@ -123,22 +91,6 @@ replace = {new_version}
12391
search = {current_version}
12492
replace = {new_version}
12593

126-
[bumpversion:file:src/IBM.Watson.NaturalLanguageClassifier.v1/Test/Integration/IBM.Watson.NLC.v1.IntegrationTests.csproj]
127-
search = {current_version}
128-
replace = {new_version}
129-
130-
[bumpversion:file:src/IBM.Watson.NaturalLanguageClassifier.v1/Test/Unit/IBM.Watson.NaturalLanguageClassifier.v1.UnitTests.csproj]
131-
search = {current_version}
132-
replace = {new_version}
133-
134-
[bumpversion:file:src/IBM.Watson.PersonalityInsights.v3/Test/Integration/IBM.Watson.PersonalityInsights.v3.IntegrationTests.csproj]
135-
search = {current_version}
136-
replace = {new_version}
137-
138-
[bumpversion:file:src/IBM.Watson.PersonalityInsights.v3/Test/Unit/IBM.Watson.PersonalityInsights.v3.UnitTests.csproj]
139-
search = {current_version}
140-
replace = {new_version}
141-
14294
[bumpversion:file:src/IBM.Watson.SpeechToText.v1/Test/Integration/IBM.Watson.SpeechToText.v1.IntegrationTests.csproj]
14395
search = {current_version}
14496
replace = {new_version}
@@ -154,27 +106,3 @@ replace = {new_version}
154106
[bumpversion:file:src/IBM.Watson.TextToSpeech.v1/Test/Unit/IBM.Watson.TextToSpeech.v1.UnitTests.csproj]
155107
search = {current_version}
156108
replace = {new_version}
157-
158-
[bumpversion:file:src/IBM.Watson.ToneAnalyzer.v3/Test/Integration/IBM.Watson.ToneAnalyzer.v3.IntegrationTests.csproj]
159-
search = {current_version}
160-
replace = {new_version}
161-
162-
[bumpversion:file:src/IBM.Watson.ToneAnalyzer.v3/Test/Unit/IBM.Watson.ToneAnalyzer.v3.UnitTests.csproj]
163-
search = {current_version}
164-
replace = {new_version}
165-
166-
[bumpversion:file:src/IBM.Watson.VisualRecognition.v3/Test/Integration/IBM.Watson.VisualRecognition.v3.IntegrationTests.csproj]
167-
search = {current_version}
168-
replace = {new_version}
169-
170-
[bumpversion:file:src/IBM.Watson.VisualRecognition.v3/Test/Unit/IBM.Watson.VisualRecognition.v3.UnitTests.csproj]
171-
search = {current_version}
172-
replace = {new_version}
173-
174-
[bumpversion:file:src/IBM.Watson.VisualRecognition.v4/Test/Integration/IBM.Watson.VisualRecognition.v4.IntegrationTests.csproj]
175-
search = {current_version}
176-
replace = {new_version}
177-
178-
[bumpversion:file:src/IBM.Watson.VisualRecognition.v4/Test/Unit/IBM.Watson.VisualRecognition.v4.UnitTests.csproj]
179-
search = {current_version}
180-
replace = {new_version}

‎.github/workflows/build-test.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,8 @@ jobs:
4141
run: |
4242
dotnet test --no-build --verbosity normal src/IBM.Watson.Assistant.v1/Test/Unit
4343
dotnet test --no-build --verbosity normal src/IBM.Watson.Assistant.v2/Test/Unit
44-
dotnet test --no-build --verbosity normal src/IBM.Watson.CompareComply.v1/Test/Unit
4544
dotnet test --no-build --verbosity normal src/IBM.Watson.Discovery.v1/Test/Unit
4645
dotnet test --no-build --verbosity normal src/IBM.Watson.Discovery.v2/Test/Unit
4746
dotnet test --no-build --verbosity normal src/IBM.Watson.LanguageTranslator.v3/Test/Unit
48-
dotnet test --no-build --verbosity normal src/IBM.Watson.NaturalLanguageClassifier.v1/Test/Unit
49-
dotnet test --no-build --verbosity normal src/IBM.Watson.NaturalLanguageUnderstanding.v1/Test/Unit
50-
dotnet test --no-build --verbosity normal src/IBM.Watson.PersonalityInsights.v3/Test/Unit
5147
dotnet test --no-build --verbosity normal src/IBM.Watson.SpeechToText.v1/Test/Unit
5248
dotnet test --no-build --verbosity normal src/IBM.Watson.TextToSpeech.v1/Test/Unit
53-
dotnet test --no-build --verbosity normal src/IBM.Watson.ToneAnalyzer.v3/Test/Unit
54-
dotnet test --no-build --verbosity normal src/IBM.Watson.VisualRecognition.v3/Test/Unit
55-
dotnet test --no-build --verbosity normal src/IBM.Watson.VisualRecognition.v4/Test/Unit

‎.github/workflows/deploy.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,12 @@ jobs:
116116
run: |
117117
dotnet pack src/IBM.Watson.Assistant.v1/IBM.Watson.Assistant.v1.csproj --configuration Release
118118
dotnet pack src/IBM.Watson.Assistant.v2/IBM.Watson.Assistant.v2.csproj --configuration Release
119-
dotnet pack src/IBM.Watson.CompareComply.v1/IBM.Watson.CompareComply.v1.csproj --configuration Release
120119
dotnet pack src/IBM.Watson.Discovery.v1/IBM.Watson.Discovery.v1.csproj --configuration Release
121120
dotnet pack src/IBM.Watson.Discovery.v2/IBM.Watson.Discovery.v2.csproj --configuration Release
122121
dotnet pack src/IBM.Watson.LanguageTranslator.v3/IBM.Watson.LanguageTranslator.v3.csproj --configuration Release
123-
dotnet pack src/IBM.Watson.NaturalLanguageClassifier.v1/IBM.Watson.NaturalLanguageClassifier.v1.csproj --configuration Release
124122
dotnet pack src/IBM.Watson.NaturalLanguageUnderstanding.v1/IBM.Watson.NaturalLanguageUnderstanding.v1.csproj --configuration Release
125-
dotnet pack src/IBM.Watson.PersonalityInsights.v3/IBM.Watson.PersonalityInsights.v3.csproj --configuration Release
126123
dotnet pack src/IBM.Watson.SpeechToText.v1/IBM.Watson.SpeechToText.v1.csproj --configuration Release
127124
dotnet pack src/IBM.Watson.TextToSpeech.v1/IBM.Watson.TextToSpeech.v1.csproj --configuration Release
128-
dotnet pack src/IBM.Watson.ToneAnalyzer.v3/IBM.Watson.ToneAnalyzer.v3.csproj --configuration Release
129-
dotnet pack src/IBM.Watson.VisualRecognition.v3/IBM.Watson.VisualRecognition.v3.csproj --configuration Release
130-
dotnet pack src/IBM.Watson.VisualRecognition.v4/IBM.Watson.VisualRecognition.v4.csproj --configuration Release
131125
132126
# I think we can publish everytime because trying to push up a duplicate will fail with already exists and cannot be modified (409)
133127
# However we will try a new technique and only push if semantic release created a new release
@@ -141,18 +135,12 @@ jobs:
141135
echo -e "\n\033[0;35mCommand: branchname - ${{ steps.get_version_tag.outputs.SOURCE_TAG }} must have TAG_NAME to publish NuGet packages"
142136
dotnet nuget push src/IBM.Watson.Assistant.v1/bin/Release/IBM.Watson.Assistant.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
143137
dotnet nuget push src/IBM.Watson.Assistant.v2/bin/Release/IBM.Watson.Assistant.v2.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
144-
dotnet nuget push src/IBM.Watson.CompareComply.v1/bin/Release/IBM.Watson.CompareComply.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
145138
dotnet nuget push src/IBM.Watson.Discovery.v1/bin/Release/IBM.Watson.Discovery.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
146139
dotnet nuget push src/IBM.Watson.Discovery.v2/bin/Release/IBM.Watson.Discovery.v2.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
147140
dotnet nuget push src/IBM.Watson.LanguageTranslator.v3/bin/Release/IBM.Watson.LanguageTranslator.v3.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
148-
dotnet nuget push src/IBM.Watson.NaturalLanguageClassifier.v1/bin/Release/IBM.Watson.NaturalLanguageClassifier.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
149141
dotnet nuget push src/IBM.Watson.NaturalLanguageUnderstanding.v1/bin/Release/IBM.Watson.NaturalLanguageUnderstanding.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
150-
dotnet nuget push src/IBM.Watson.PersonalityInsights.v3/bin/Release/IBM.Watson.PersonalityInsights.v3.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
151142
dotnet nuget push src/IBM.Watson.SpeechToText.v1/bin/Release/IBM.Watson.SpeechToText.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
152143
dotnet nuget push src/IBM.Watson.TextToSpeech.v1/bin/Release/IBM.Watson.TextToSpeech.v1.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
153-
dotnet nuget push src/IBM.Watson.ToneAnalyzer.v3/bin/Release/IBM.Watson.ToneAnalyzer.v3.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
154-
dotnet nuget push src/IBM.Watson.VisualRecognition.v3/bin/Release/IBM.Watson.VisualRecognition.v3.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
155-
dotnet nuget push src/IBM.Watson.VisualRecognition.v4/bin/Release/IBM.Watson.VisualRecognition.v4.${REPO_TAG_NAME}.nupkg -k ${NUGET_TOKEN} -s https://api.nuget.org/v3/index.json
156144
157145
- name: SKIP - Publish/Deploy to Git and Nuget
158146
if: ${{ steps.is_new_release.outputs.IS_NEW_RELEASE == '0' }}

‎.github/workflows/integration-test.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,14 @@ jobs:
3737
- name: Execute Dotnet integration tests
3838
# continue-on-error: true
3939
env:
40-
NATURAL_LANGUAGE_CLASSIFIER_URL: "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com"
41-
NATURAL_LANGUAGE_CLASSIFIER_APIKEY: ${{ secrets.NLC_APIKEY }}
42-
NATURAL_LANGUAGE_CLASSIFIER_ID: ${{ secrets.NLC_CLASSIFIER_ID }}
4340
LANGUAGE_TRANSLATOR_APIKEY: ${{ secrets.LT_APIKEY }}
4441
LANGUAGE_TRANSLATOR_URL: "https://api.us-south.language-translator.watson.cloud.ibm.com"
4542
NATURAL_LANGUAGE_UNDERSTANDING_APIKEY: ${{ secrets.NLU_APIKEY }}
4643
NATURAL_LANGUAGE_UNDERSTANDING_URL: "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com"
47-
PERSONALITY_INSIGHTS_APIKEY: ${{ secrets.PI_APIKEY }}
48-
PERSONALITY_INSIGHTS_URL: "https://api.us-south.personality-insights.watson.cloud.ibm.com"
49-
TONE_ANALYZER_APIKEY: ${{ secrets.TA_APIKEY }}
50-
TONE_ANALYZER_URL: "https://api.us-south.tone-analyzer.watson.cloud.ibm.com"
5144
SPEECH_TO_TEXT_APIKEY: ${{ secrets.STT_APIKEY }}
5245
SPEECH_TO_TEXT_URL: "https://api.us-south.speech-to-text.watson.cloud.ibm.com"
5346
TEXT_TO_SPEECH_APIKEY: ${{ secrets.TTS_APIKEY }}
5447
TEXT_TO_SPEECH_URL: "https://api.us-south.text-to-speech.watson.cloud.ibm.com"
55-
VISUAL_RECOGNITION_APIKEY: ${{ secrets.VR_APIKEY }}
56-
VISUAL_RECOGNITION_COLLECTION_ID: ${{ secrets.VR_COLLECTION_ID }}
57-
VISUAL_RECOGNITION_URL: "https://api.us-south.visual-recognition.watson.cloud.ibm.com"
58-
COMPARE_COMPLY_APIKEY: ${{ secrets.CC_APIKEY }}
59-
COMPARE_COMPLY_FEEDBACK_ID: ${{ secrets.CC_FEEDBACK_ID }}
60-
COMPARE_COMPLY_URL: "https://api.us-south.compare-comply.watson.cloud.ibm.com"
6148
ASSISTANT_APIKEY: ${{ secrets.WA_APIKEY }}
6249
ASSISTANT_WORKSPACE_ID: ${{ secrets.WA_WORKSPACE_ID }}
6350
ASSISTANT_ASSISTANT_ID: ${{ secrets.WA_ASSISTANT_ID }}
@@ -72,16 +59,10 @@ jobs:
7259
DISCOVERY_V2_URL: "https://api.us-south.discovery.watson.cloud.ibm.com"
7360
run: |
7461
echo -e "\n\033[0;35mCommand: Run Integration Tests"
75-
dotnet test --no-build --verbosity normal src/IBM.Watson.NaturalLanguageClassifier.v1/Test/Integration
7662
dotnet test --no-build --verbosity normal src/IBM.Watson.LanguageTranslator.v3/Test/Integration
7763
dotnet test --no-build --verbosity normal src/IBM.Watson.NaturalLanguageUnderstanding.v1/Test/Integration
78-
dotnet test --no-build --verbosity normal src/IBM.Watson.PersonalityInsights.v3/Test/Integration
79-
dotnet test --no-build --verbosity normal src/IBM.Watson.ToneAnalyzer.v3/Test/Integration
8064
dotnet test --no-build --verbosity normal src/IBM.Watson.SpeechToText.v1/Test/Integration
8165
dotnet test --no-build --verbosity normal src/IBM.Watson.TextToSpeech.v1/Test/Integration
82-
echo -e "\n\033[0;35mSKIP : dotnet test --no-build --verbosity normal src/IBM.Watson.VisualRecognition.v3/Test/Integration"
83-
echo -e "\n\033[0;35mSKIP: dotnet test --no-build --verbosity normal src/IBM.Watson.VisualRecognition.v4/Test/Integration"
84-
echo -e "\n\033[0;35mSKIP: dotnet test --no-build --verbosity normal src/IBM.Watson.CompareComply.v1/Test/Integration"
8566
dotnet test --no-build --verbosity normal src/IBM.Watson.Assistant.v1/Test/Integration
8667
dotnet test --no-build --verbosity normal src/IBM.Watson.Assistant.v2/Test/Integration
8768
dotnet test --no-build --verbosity normal src/IBM.Watson.Discovery.v1/Test/Integration

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,3 @@ npm-debug.log
252252
**/*.openapi-generator*
253253

254254
.pre-commit-config.yaml
255-
.secrets.baseline

0 commit comments

Comments
 (0)