Merge branch 'master' into mattm/fix-build

# Conflicts:
#	.circleci/config.yml
#	.github/workflows/build.yml
#	.travis.yml
#	README.md
#	RELEASE.md
#	appveyor.yml
#	azure-pipelines.yml
This commit is contained in:
Matt Mazzola 2019-12-16 13:47:05 -08:00
Родитель 225eabbba2 8e5f13b8e3
Коммит 6e4abf7257
6 изменённых файлов: 23 добавлений и 18 удалений

Просмотреть файл

@ -78,7 +78,7 @@ jobs:
- ~/.cache
- run: npx lerna run build
- run: npx lerna run test --ignore @mattmazzola/webchat
- run: npx lerna run test --ignore @conversationlearner/webchat
- run: npx lerna run report-coverage
test-smoke:
@ -110,6 +110,11 @@ jobs:
- run: node .circleci/SetLuisAuthoringKey.js >> $BASH_ENV
- run_bot_and_ui
- run:
command: npm run cypress -- run --record false --spec "cypress/integration/Tools/DeleteAllTestGeneratedModels.spec.js"
when: always
working_directory: packages/ui
# Run smoke tests against sample
- run:
command: npm run cypress -- run --record false --spec "cypress/integration/smoke/required/**/*.spec.*"
@ -253,7 +258,7 @@ jobs:
# Investigated submodules and subtrees but neither seemed offer simplicity that we want while still keeping this repo as source of truth
# TODO: Look at using token only in git push instead of clone so it's not stored
# E.g. 'git pull https://<token>@github.com/username/bar.git'
- run: git clone https://${GH_TOKEN_SAMPLES}@github.com/mattmazzola/ConversationLearner-Samples << parameters.clone_path >> -b develop
- run: git clone https://${GH_TOKEN_SAMPLES}@github.com/conversationlearner/ConversationLearner-Samples << parameters.clone_path >> -b develop
# TODO: Try to consolidate to single copy command
- run: cp ./packages/samples/src/ << parameters.clone_path >> -frv
- run: cp ./packages/samples/*.* << parameters.clone_path >> -fv

Просмотреть файл

@ -24,4 +24,4 @@ install:
script:
- npx lerna run build
- npx lerna run test --ignore @mattmazzola/webchat
- npx lerna run test --ignore @conversationlearner/webchat

Просмотреть файл

@ -1,6 +1,6 @@
# ConversationLearner
[![CircleCI](https://circleci.com/gh/mattmazzola/conversation-learner-lerna.svg?style=svg)](https://circleci.com/gh/mattmazzola/conversation-learner-lerna)
[![CircleCI](https://circleci.com/gh/microsoft/conversationlearner.svg?style=svg)](https://circleci.com/gh/microsoft/conversationlearner)\
This repo contains 5 major components:
1. **Samples** - Fully working bots using express, botbuilder, and the ConversationLearner SDK which demonstrate different use cases in code.
@ -59,10 +59,10 @@ The SDK includes contains 2 notable components:
# Using the SDK
Install @mattmazzola/sdk in consuming project:
Install @conversationlearner/sdk in consuming project:
```bash
npm install @mattmazzola/sdk --save-exact
npm install @conversationlearner/sdk --save-exact
```
> Note: We recommend using --save-exact to lock the version since we are NOT following SemVer at this time. This can help prevent accidental package updates which may contain breaking changes if you are not using package-lock.json. We will move to following SemVer soon as we improve our release process.
@ -70,7 +70,7 @@ npm install @mattmazzola/sdk --save-exact
Using the recognizer:
```typescript
import { ConversationLearner, ICLOptions, ClientMemoryManager } from '@mattmazzola/sdk'
import { ConversationLearner, ICLOptions, ClientMemoryManager } from '@conversationlearner/sdk'
...
@ -101,7 +101,7 @@ Previously the UI was served separately and required to be run on a different po
```typescript
...
import { uiRouter } from '@mattmazzola/sdk'
import { uiRouter } from '@conversationlearner/sdk'
...

Просмотреть файл

@ -1,21 +1,21 @@
# Release Process
This document outlines the process a developer would take to release a new version of @mattmazzola/sdk.
This document outlines the process a developer would take to release a new version of @conversationlearner/sdk.
## Dependency Tree
In normal applications UI is generally the top level dependency the user interacts with; however, in this case @mattmazzola/ui is an actual npm package of the @mattmazzola/sdk. This allows the SDK to provide every thing the developer needs to get started.
In normal applications UI is generally the top level dependency the user interacts with; however, in this case @conversationlearner/ui is an actual npm package of the @conversationlearner/sdk. This allows the SDK to provide every thing the developer needs to get started.
```
converstionlearner-samples
|
@mattmazzola/sdk
@conversationlearner/sdk
| \
| @mattmazzola/ui
| @conversationlearner/ui
| / \
| / @mattmazzola/webchat
| / @conversationlearner/webchat
| /
@mattmazzola/models
@conversationlearner/models
```
> Notice @mattmazzola/models is consumed by both the SDK and UI
> Notice @conversationlearner/models is consumed by both the SDK and UI

Просмотреть файл

@ -21,4 +21,4 @@ build_script:
- npx lerna run build
test_script:
- npx lerna run test --ignore @mattmazzola/webchat
- npx lerna run test --ignore @conversationlearner/webchat

Просмотреть файл

@ -35,8 +35,8 @@ jobs:
- bash: npx lerna run build
displayName: 'npx lerna run build'
- bash: npx lerna run test --ignore @mattmazzola/webchat
displayName: 'npx lerna run test --ignore @mattmazzola/webchat'
- bash: npx lerna run test --ignore @conversationlearner/webchat
displayName: 'npx lerna run test --ignore @conversationlearner/webchat'
- job: windows_build
pool: