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

Conversation

@cosmicshuai
Copy link
Contributor

@cosmicshuai cosmicshuai commented Apr 22, 2021

closes: #1205

In this PR, the import resolver for luis and qna files will find the correct import files based on the locale info.
Suppose we have a.en-us.lu with content

[import](b.lu)

The import resolver will find the b.en-us.lu

@cosmicshuai cosmicshuai changed the title fix lf:luis-cross train does not find imported files with locale fix luis-cross train does not find imported files with locale Apr 22, 2021
Copy link
Contributor

@feich-ms feich-ms left a comment

Choose a reason for hiding this comment

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

:shipit:

@boydc2014
Copy link
Contributor

@munozemilio this is a fix for adaptive runtime CI/CD, it's been verified, can you help get it in

gabog
gabog previously requested changes Apr 23, 2021
Copy link
Contributor

@gabog gabog left a comment

Choose a reason for hiding this comment

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

I think you missed changing the ignore parameter in the readme files (I still see --ignore there and should be --exclude, right?)

@cosmicshuai cosmicshuai requested a review from gabog April 24, 2021 06:16
Copy link
Contributor

@munozemilio munozemilio left a comment

Choose a reason for hiding this comment

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

Should content be added to the test empty files? Some typos also need to be addressed.

@cosmicshuai cosmicshuai requested a review from munozemilio April 27, 2021 01:57
@cosmicshuai
Copy link
Contributor Author

@munozemilio The empty content test files are from a real Composer bot, I think it is OK to keep them empty. There are import files with locale. So the test covers the code added in this PR.

--log Writes out log messages to console
--exclude Excludes given folders under the input directory, for example, --exclude bin,obj,lib, this will ignore the /bin, /obj, /lib folders under the input path
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI This will be overriden by the doc script.

@cosmicshuai cosmicshuai merged commit c0be653 into main Apr 27, 2021
@munozemilio munozemilio deleted the shuwan/fixImportLocale branch April 27, 2021 16:13
munozemilio added a commit that referenced this pull request Apr 28, 2021
* fix import file with locale

* simplify test

* change folder structures

* remove only

* add cross train config

* fix spelling

* modify test

* change naming

* fix readme

* fix typo

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>
munozemilio added a commit that referenced this pull request Apr 28, 2021
* fix import file with locale

* simplify test

* change folder structures

* remove only

* add cross train config

* fix spelling

* modify test

* change naming

* fix readme

* fix typo

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>
munozemilio added a commit that referenced this pull request Apr 28, 2021
* fix luis cross train unable to reference external files (#1181)

* init

* add path resovle

* fix import path resolve issue

* add tests

* fix lint and unused imports

* modify config name

* retrigger

* refactor

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>

* fix luis:build write out version in luis setting when the directVersionPublish is not set (#1215)

* init

* fix tests

* retrigger

* remove redundent ()

* up versioned orchestrator-core to 4.13.1 (#1211)

* Update package.json

Use orchestrator-core v 4.13.1

* Update pnpm-lock.yaml

* skip empty lu file, added empty lu file to test

* Update orchestratorhelper.ts

fixed lint issues

* use forward slash for file path in orchestrator.settings.json to be compatible with non windows platform

* addressed PR comments

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>

* fix luis-cross train does not find imported files with locale (#1209)

* fix import file with locale

* simplify test

* change folder structures

* remove only

* add cross train config

* fix spelling

* modify test

* change naming

* fix readme

* fix typo

Co-authored-by: Emilio Munoz <emmunozp@microsoft.com>

Co-authored-by: Shuai Wang <shuwan@microsoft.com>
Co-authored-by: Tien Suwandy <tiens@microsoft.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bf luis:cross-train imports don't work correctly

6 participants