From cb485298843ce1b0094216be0e816f05491f4082 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 2 Jan 2026 14:02:48 +0300 Subject: [PATCH 1/4] test oscript 2.0.0 --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 21707fc2..d65cdcfa 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - oscript_version: ['1.9.2'] + oscript_version: ['1.9.2', '2.0.0'] v8_version: ['8.3.21.1624', '8.3.24.1691'] os: [windows-latest, ubuntu-22.04] locale: ['ru_RU'] From af0ce76cab977763645eb954fe1ce123df5b3193 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 2 Jan 2026 17:02:58 +0300 Subject: [PATCH 2/4] bump configor, fix ga oscript versions --- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/testing.yml | 2 +- features/cmd/step_definitions/all.os | 6 +++--- packagedef | 5 +++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 84e04b47..8cdb145a 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04] - oscript_version: ['1.9.2'] + oscript_version: ['default'] v8_version: ['8.3.24.1691'] locale: ['ru_RU'] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40271426..6153ae17 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - oscript_version: ['1.9.2'] + oscript_version: ['default'] package_mask: ["gitsync-*.ospx"] steps: # Загрузка проекта diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d65cdcfa..6b47a641 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - oscript_version: ['1.9.2', '2.0.0'] + oscript_version: ['default', 'stable', 'dev'] v8_version: ['8.3.21.1624', '8.3.24.1691'] os: [windows-latest, ubuntu-22.04] locale: ['ru_RU'] diff --git a/features/cmd/step_definitions/all.os b/features/cmd/step_definitions/all.os index 89e6bfe8..ca96437c 100644 --- a/features/cmd/step_definitions/all.os +++ b/features/cmd/step_definitions/all.os @@ -1,5 +1,5 @@ #Использовать tempfiles -#Использовать yaml +#Использовать oscript-yaml // Реализация шагов BDD-фич/сценариев c помощью фреймворка https://github.com/artbear/1bdd @@ -99,8 +99,8 @@ ТекстYaml = ЧтениеТекста.Прочитать(); ЧтениеТекста.Закрыть(); - ПарсерYAml = Новый ПарсерYaml(); - Результа = ПарсерYAml.ПрочитатьYaml(ТекстYaml); + Парсер = Новый ПарсерYaml(); + Результа = Парсер.ПрочитатьYaml(ТекстYaml); ТекстJson = ОБъектВJson(Результа); diff --git a/packagedef b/packagedef index 1abb05b2..4303b526 100644 --- a/packagedef +++ b/packagedef @@ -1,7 +1,7 @@ Описание.Имя("gitsync") .Версия("3.7.0") - .ВерсияСреды("1.9.2") + .ВерсияСреды("2.0.0") .ЗависитОт("logos", "1.7.1") .ЗависитОт("tempfiles", "1.1.1") .ЗависитОт("v8runner", "1.12.0") @@ -16,10 +16,11 @@ .ЗависитОт("opm", "1.6.5") .ЗависитОт("cli", "0.11.0") .ЗависитОт("cli-selector", "0.5.0") - .ЗависитОт("configor", "0.10.0") + .ЗависитОт("configor", "0.11.0") .РазработкаЗависитОт("1bdd", "1.15.1") .РазработкаЗависитОт("1testrunner", "1.9.0") .РазработкаЗависитОт("asserts", "1.6.1") + .РазработкаЗависитОт("oscript-yaml", "0.2.0") .РазработкаЗависитОт("coverage", "0.7.0") .ВключитьФайл("src") .ВключитьФайл("docs") From b9be4cf5ed282cf45ea77cb9e84baf0243210643 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Fri, 2 Jan 2026 17:15:32 +0300 Subject: [PATCH 3/4] bump gitsync version, fix testing version --- .github/workflows/testing.yml | 2 +- build_packagedef | 4 ++-- packagedef | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6b47a641..e77b0640 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - oscript_version: ['default', 'stable', 'dev'] + oscript_version: ['2.0.0', 'stable', 'dev'] v8_version: ['8.3.21.1624', '8.3.24.1691'] os: [windows-latest, ubuntu-22.04] locale: ['ru_RU'] diff --git a/build_packagedef b/build_packagedef index b4270966..9996094f 100644 --- a/build_packagedef +++ b/build_packagedef @@ -44,8 +44,8 @@ КонецПроцедуры Описание.Имя("gitsync") - .Версия("3.7.0") - .ВерсияСреды("1.9.2") + .Версия("3.8.0") + .ВерсияСреды("2.0.0") .ВключитьФайл("src") .ВключитьФайл("embedded_plugins") .ВключитьФайл("oscript_modules") diff --git a/packagedef b/packagedef index 4303b526..f9693886 100644 --- a/packagedef +++ b/packagedef @@ -1,6 +1,6 @@ Описание.Имя("gitsync") - .Версия("3.7.0") + .Версия("3.8.0") .ВерсияСреды("2.0.0") .ЗависитОт("logos", "1.7.1") .ЗависитОт("tempfiles", "1.1.1") From cff4f8cf2376373f0465aa334f925cccd5ffa481 Mon Sep 17 00:00:00 2001 From: Dima Ovcharenko Date: Mon, 5 Jan 2026 14:34:11 +0300 Subject: [PATCH 4/4] fix oscript versons in ga --- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 8cdb145a..fef0a8e7 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04] - oscript_version: ['default'] + oscript_version: ['2.0.0'] v8_version: ['8.3.24.1691'] locale: ['ru_RU'] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6153ae17..e79d69d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - oscript_version: ['default'] + oscript_version: ['2.0.0'] package_mask: ["gitsync-*.ospx"] steps: # Загрузка проекта