From 0815fd4895272b7611b5e11019759d31b955d987 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Mon, 29 Jan 2024 16:25:57 +0000 Subject: [PATCH 1/7] fix: added curation for union NPM package --- .ort.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.ort.yml b/.ort.yml index e4c3a5f67..af0f40860 100644 --- a/.ort.yml +++ b/.ort.yml @@ -1,4 +1,9 @@ --- +curations: + packages: + - id: "NPM::union:0.5.0" + curations: + concluded_license: "MIT" excludes: paths: - pattern: "package-lock.json" From 8bafeb5e475af696f64d619d97ebfa60a823f0c8 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Tue, 30 Jan 2024 10:42:52 +0000 Subject: [PATCH 2/7] fix: moved curations to config.yml --- .ort.yml | 5 ----- config.yml | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 config.yml diff --git a/.ort.yml b/.ort.yml index af0f40860..e4c3a5f67 100644 --- a/.ort.yml +++ b/.ort.yml @@ -1,9 +1,4 @@ --- -curations: - packages: - - id: "NPM::union:0.5.0" - curations: - concluded_license: "MIT" excludes: paths: - pattern: "package-lock.json" diff --git a/config.yml b/config.yml new file mode 100644 index 000000000..9eddb57a5 --- /dev/null +++ b/config.yml @@ -0,0 +1,6 @@ +--- +curations: + packages: + - id: "NPM::union:0.5.0" + curations: + concluded_license: "MIT" \ No newline at end of file From afa0b0cff8d0abcb41854f2ddbf9795f900061bf Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Tue, 30 Jan 2024 10:54:01 +0000 Subject: [PATCH 3/7] fix: added comment --- config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yml b/config.yml index 9eddb57a5..db863b078 100644 --- a/config.yml +++ b/config.yml @@ -3,4 +3,5 @@ curations: packages: - id: "NPM::union:0.5.0" curations: + comment: "This package is licensed under MIT License: https://github.com/flatiron/union/blob/main/LICENSE" concluded_license: "MIT" \ No newline at end of file From 7f9eb71dc9ca78709a6fc4053159a2245cffaf58 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Tue, 30 Jan 2024 13:20:59 +0000 Subject: [PATCH 4/7] fix: fixed ort curations --- config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yml b/config.yml index db863b078..5c49765c7 100644 --- a/config.yml +++ b/config.yml @@ -1,7 +1,7 @@ --- curations: packages: - - id: "NPM::union:0.5.0" + - id: "NPM::union:0.4.0" curations: comment: "This package is licensed under MIT License: https://github.com/flatiron/union/blob/main/LICENSE" concluded_license: "MIT" \ No newline at end of file From d322cfe01fc50e2512eb6805baf95f534fdb02c9 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Tue, 30 Jan 2024 13:31:11 +0000 Subject: [PATCH 5/7] fix: removed ort config --- config.yml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 config.yml diff --git a/config.yml b/config.yml deleted file mode 100644 index 5c49765c7..000000000 --- a/config.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -curations: - packages: - - id: "NPM::union:0.4.0" - curations: - comment: "This package is licensed under MIT License: https://github.com/flatiron/union/blob/main/LICENSE" - concluded_license: "MIT" \ No newline at end of file From 5967f5117a8ace6ae80a225e865fae169ec2642a Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Tue, 30 Jan 2024 13:48:03 +0000 Subject: [PATCH 6/7] fix: added union package --- config.yml | 5 +++++ package-lock.json | 36 ++++++++++++++++++++++++++---------- package.json | 1 + 3 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 config.yml diff --git a/config.yml b/config.yml new file mode 100644 index 000000000..3be02f2e9 --- /dev/null +++ b/config.yml @@ -0,0 +1,5 @@ + packages: + - id: "NPM::union:0.5.0" + curations: + comment: "This package is licensed under MIT License: https://github.com/flatiron/union/blob/main/LICENSE" + concluded_license: "MIT" \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d8a1c49d2..3d0e63fce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -53,6 +53,7 @@ "remark-gfm": "^3.0.1", "rxjs": "^7.8.1", "svgo": "^3.0.2", + "union": "^0.5.0", "uuid": "^9.0.0" }, "devDependencies": { @@ -5454,7 +5455,6 @@ }, "node_modules/call-bind": { "version": "1.0.5", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2", @@ -6009,7 +6009,6 @@ }, "node_modules/define-data-property": { "version": "1.1.1", - "dev": true, "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.1", @@ -7463,7 +7462,6 @@ }, "node_modules/get-intrinsic": { "version": "1.2.2", - "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.2", @@ -7596,7 +7594,6 @@ }, "node_modules/gopd": { "version": "1.0.1", - "dev": true, "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" @@ -7649,7 +7646,6 @@ }, "node_modules/has-property-descriptors": { "version": "1.0.0", - "dev": true, "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.1" @@ -7660,7 +7656,6 @@ }, "node_modules/has-proto": { "version": "1.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -7671,7 +7666,6 @@ }, "node_modules/has-symbols": { "version": "1.0.3", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -10140,7 +10134,6 @@ }, "node_modules/object-inspect": { "version": "1.12.3", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10920,6 +10913,20 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/querystringify": { "version": "2.2.0", "license": "MIT" @@ -11748,7 +11755,6 @@ }, "node_modules/set-function-length": { "version": "1.1.1", - "dev": true, "license": "MIT", "dependencies": { "define-data-property": "^1.1.1", @@ -11798,7 +11804,6 @@ }, "node_modules/side-channel": { "version": "1.0.4", - "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.0", @@ -12627,6 +12632,17 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/union": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/union/-/union-0.5.0.tgz", + "integrity": "sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==", + "dependencies": { + "qs": "^6.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/unist-util-generated": { "version": "2.0.1", "license": "MIT", diff --git a/package.json b/package.json index eeaafb07d..3b600793c 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ "remark-gfm": "^3.0.1", "rxjs": "^7.8.1", "svgo": "^3.0.2", + "union": "^0.5.0", "uuid": "^9.0.0" }, "devDependencies": { From e33d7c23830397ccf299ba70b616de04a4b515e5 Mon Sep 17 00:00:00 2001 From: Anton Dubovik Date: Tue, 30 Jan 2024 14:56:17 +0000 Subject: [PATCH 7/7] fix: added ort env var --- .github/workflows/pr_check_tests.yml | 3 +++ config.yml | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_check_tests.yml b/.github/workflows/pr_check_tests.yml index c377929d6..a2ffef35c 100644 --- a/.github/workflows/pr_check_tests.yml +++ b/.github/workflows/pr_check_tests.yml @@ -4,6 +4,9 @@ on: pull_request: branches: [ development, release-* ] +env: + ORT_CONFIG_DIR: '.' + jobs: run_tests: uses: epam/ai-dial-ci/.github/workflows/test_yarn_docker.yml@1.1.0 diff --git a/config.yml b/config.yml index 3be02f2e9..af844f689 100644 --- a/config.yml +++ b/config.yml @@ -1,5 +1,6 @@ - packages: - - id: "NPM::union:0.5.0" - curations: - comment: "This package is licensed under MIT License: https://github.com/flatiron/union/blob/main/LICENSE" - concluded_license: "MIT" \ No newline at end of file +--- +packages: +- id: "NPM::union:0.5.0" + curations: + comment: "This package is licensed under MIT License: https://github.com/flatiron/union/blob/main/LICENSE" + concluded_license: "MIT" \ No newline at end of file