Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Conversation

@lei9444
Copy link
Contributor

@lei9444 lei9444 commented Nov 30, 2020

Description

In azure publish we use the old build flow and copy some code from local build and generate the crosstrain config by itself. It is difficult to upgrade this part code of build and add new feature for azure publish.

In this PR:

  • remove the duplicate code for build and use the builder instance from current project to build the bot.

  • add orchestrator build for azure publish

  1. update the build result in orchestrator.setting.json.(use relative path)
  1. copy the orchestrator build model to bot folder

Task Item

closes #4980

Screenshots

image
image
image

@boydc2014
Copy link
Contributor

@taicchoumsft @luhan2017 can you help verify this?

@boydc2014 boydc2014 added the 1.3 1.3 Release label Nov 30, 2020
@coveralls
Copy link

coveralls commented Nov 30, 2020

Coverage Status

Coverage decreased (-0.06%) to 55.23% when pulling c8abbc6 on lei9444:azurebuild into 0cc775d on microsoft:main.

@boydc2014
Copy link
Contributor

@VanyLaw can you also help take a look at this one, there is some refactor along with the new feature, we basically removed a lot of duplicated code, can you confirm if it make sense?

taicchoumsft
taicchoumsft previously approved these changes Dec 1, 2020
Copy link
Member

@taicchoumsft taicchoumsft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@luhan2017
Copy link
Contributor

The qna build error is not properly handled:
image
image
The publish is success, but I can't query the remote bot

@lei9444
Copy link
Contributor Author

lei9444 commented Dec 1, 2020

The qna build error is not properly handled:
image
image
The publish is success, but I can't query the remote bot

fixed it
image

@boydc2014 boydc2014 merged commit 45633d4 into microsoft:main Dec 2, 2020
boydc2014 pushed a commit that referenced this pull request Dec 2, 2020
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
boydc2014 pushed a commit that referenced this pull request Dec 2, 2020
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
boydc2014 pushed a commit that referenced this pull request Dec 2, 2020
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit to benbrown/BotFramework-Composer that referenced this pull request May 24, 2021
* try-catch around trigger grouping expressions (microsoft#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (microsoft#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (microsoft#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (microsoft#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (microsoft#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
benbrown pushed a commit that referenced this pull request Jun 11, 2021
* try-catch around trigger grouping expressions (#5017)

Co-authored-by: Ben Yackley <[email protected]>

* chore: Updated installOneAuth script to target correct version. (#5020)

* Updated installOneAuth script to target correct version.

* Better refactor

* feat: adaptive expression functions menu (#5015)

* expressions menu

* Fixing aligment of menu

* PR comments

Co-authored-by: Soroush <[email protected]>

* fix: Correct handling of focus for Intellisense fields (#5039)

* fix

* Improved handling of focus when leveraging an Intellisense suggestion

* comments on wrong lines

* feat: azure publish with orchestrator (#5011)

* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig

Co-authored-by: Geoff Cox (Microsoft) <[email protected]>
Co-authored-by: Ben Yackley <[email protected]>
Co-authored-by: Tony Anziano <[email protected]>
Co-authored-by: LouisEugeneMSFT <[email protected]>
Co-authored-by: Soroush <[email protected]>
Co-authored-by: leileizhang <[email protected]>
lei9444 added a commit to lei9444/BotFramework-Composer-1 that referenced this pull request Jun 15, 2021
* refactor the luis build in azure publish

* update the orchestrator path

* update the cleanup

* fix typo

* catch the build error

* remove qna endpoint

* remove console

* add qnaconfig
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

1.3 1.3 Release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Azure publish plugin should not copy code to re-build bot

6 participants