From 004e0c510e4092501e567f1fdb128fd414b7fbc6 Mon Sep 17 00:00:00 2001 From: Oleg Karataev Date: Sun, 28 Sep 2025 19:20:11 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20mdo=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=20=D0=B2=20EDT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" "b/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" index 573e384..8d592cb 100644 --- "a/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" +++ "b/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" @@ -95,7 +95,7 @@ Иначе - имяФайла = компоненты[1] + ".mdo"; + имяФайла = компоненты[1] + "/" + компоненты[1] + ".mdo"; КонецЕсли; From 39e04780f8852479bfe4143c582173b11835b54a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 29 Sep 2025 11:52:36 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81:=20=D0=A0=D0=B0?= =?UTF-8?q?=D0=B7=D0=B4=D0=B5=D0=BB=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" "b/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" index 8d592cb..f5949dd 100644 --- "a/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" +++ "b/src/\320\232\320\273\320\260\321\201\321\201\321\213/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274.os" @@ -95,7 +95,7 @@ Иначе - имяФайла = компоненты[1] + "/" + компоненты[1] + ".mdo"; + имяФайла = компоненты[1] + ПолучитьРазделительПути() + компоненты[1] + ".mdo"; КонецЕсли; From 000ed66dfff8e18ba1fed64e40caf8255bb1dceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 29 Sep 2025 11:56:43 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20(ci):=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D0=BE=D1=81=D0=BA=D1=80=D0=B8?= =?UTF-8?q?=D0=BF=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/testing.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index f01439d..fb7a128 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - oscript_version: ['1.8.3'] + oscript_version: ['1.9.3'] steps: # Загрузка проекта diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1364a4..0c2e1df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - oscript_version: ['1.8.3'] + oscript_version: ['1.9.3'] steps: # Загрузка проекта diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 9555aac..9bec082 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - oscript_version: ['1.8.3'] + oscript_version: ['1.9.3'] steps: # Загрузка проекта From 81f7c21254f8f504f609422876d430d56e394883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 29 Sep 2025 12:05:03 +0300 Subject: [PATCH 4/5] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20(=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D1=8B):=20=D0=A0=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D0=B8=20=D0=BF=D1=83=D1=82=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=B2=20=D0=BB=D0=B8=D0=BD=D1=83=D0=BA=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0\264\320\260\320\275\320\275\321\213\320\274_test.os" | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git "a/tests/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274_test.os" "b/tests/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274_test.os" index ef1e855..6418813 100644 --- "a/tests/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274_test.os" +++ "b/tests/\320\237\321\203\321\202\321\2141\320\241\320\237\320\276\320\234\320\265\321\202\320\260\320\264\320\260\320\275\320\275\321\213\320\274_test.os" @@ -40,7 +40,7 @@ Путь = ГенераторПутей.Путь("ОбщийМодуль.ОбщегоНазначения"); - Ожидаем.Что(Путь).Равно("src\CommonModules\ОбщегоНазначения\ОбщегоНазначения.mdo"); + Ожидаем.Что(Путь).Равно(ОбъединитьПути("src", "CommonModules", "ОбщегоНазначения", "ОбщегоНазначения.mdo")); КонецПроцедуры @@ -50,7 +50,7 @@ Путь = ГенераторПутей.Путь("ОбщийМодуль.ОбщегоНазначения"); - Ожидаем.Что(Путь).Равно("src\CommonModules\ОбщегоНазначения.xml"); + Ожидаем.Что(Путь).Равно(ОбъединитьПути("src", "CommonModules", "ОбщегоНазначения.xml")); КонецПроцедуры @@ -60,7 +60,7 @@ Путь = ГенераторПутей.Путь("Catalog.ШаблоныАнкет"); - Ожидаем.Что(Путь).Равно("src\Catalogs\ШаблоныАнкет\ШаблоныАнкет.mdo"); + Ожидаем.Что(Путь).Равно(ОбъединитьПути("src", "Catalogs", "ШаблоныАнкет", "ШаблоныАнкет.mdo")); КонецПроцедуры @@ -70,7 +70,7 @@ Путь = ГенераторПутей.Путь("Catalog.ШаблоныАнкет"); - Ожидаем.Что(Путь).Равно("src\Catalogs\ШаблоныАнкет.xml"); + Ожидаем.Что(Путь).Равно(ОбъединитьПути("src", "Catalogs", "ШаблоныАнкет.xml")); КонецПроцедуры From 10af8d35b9a7d0e12a02b5b63db5f3124845a631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A1=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 29 Sep 2025 12:13:23 +0300 Subject: [PATCH 5/5] 0.3.7 --- packagedef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packagedef b/packagedef index 89a2750..5186db3 100644 --- a/packagedef +++ b/packagedef @@ -1,5 +1,5 @@ Описание.Имя("v8metadata-reader") - .Версия("0.3.6") + .Версия("0.3.7") .ЗависитОт("logos") .ЗависитОт("xml-parser") .ЗависитОт("csv")