From 0f237dc92c36dd94140eb475319cc8d3da25b743 Mon Sep 17 00:00:00 2001
From: Anton Titovets <bayselonarrend@gmail.com>
Date: Mon, 28 Oct 2024 12:48:48 +0300
Subject: [PATCH] =?UTF-8?q?GA=20=D0=B4=D0=BB=D1=8F=20CLI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Modules/МетодыФормированияТестовGA.os | 31 ++++---------------
service/localization_vars/en.json | 1 +
service/localization_vars/ru.json | 1 +
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/ci/os/internal/Modules/МетодыФормированияТестовGA.os b/ci/os/internal/Modules/МетодыФормированияТестовGA.os
index 58ce2dfac3..d1d0a8ea2d 100644
--- a/ci/os/internal/Modules/МетодыФормированияТестовGA.os
+++ b/ci/os/internal/Modules/МетодыФормированияТестовGA.os
@@ -44,7 +44,7 @@
Процедура СформироватьЗапуск(Знач ТаблицаТестов, Знач СписокБиблиотек, Знач Язык, Знач Параметры)
- МодульТестов = Параметры["testsModule"];
+ МодульТестов = Параметры["testsModuleCLI"];
СтрокаРаздел = Параметры["sectionsString"];
СтрокаМетод = Параметры["methodString"];
СтрокаСиноним = Параметры["synonymString"];
@@ -85,9 +85,10 @@
|
| - name: Установить OInt
| run: |
- | cd ./src/" + Язык + "/OInt
- | opm build
- | opm install *.ospx
+ | TEMP_DEB=""$(mktemp)"" &&
+ | wget -O ""$TEMP_DEB"" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.15.1/oint_1.15.1_all_ru.deb' &&
+ | sudo dpkg -i ""$TEMP_DEB""
+ | rm -f ""$TEMP_DEB""
|
|";
@@ -103,7 +104,7 @@
|
| - name: " + Синоним + "
| if: ${{ cancelled() }} == false
- | run: oscript " + Раннер + " -run " + ФайлТестов + " """ + Метод + """";
+ | run: oscript " + Раннер + " -run " + ФайлТестов + " ""CLI_" + Метод + """";
КонецЦикла;
@@ -147,26 +148,6 @@
| runs-on: ubuntu-latest
| steps:
| - uses: actions/checkout@v4
- | - uses: otymko/setup-onescript@v1.4
- | with:
- | version: 1.9.0
- |
- | - name: Установить asserts и 1testrunner
- | run: |
- | opm install asserts
- | opm install 1testrunner
- |
- | - name: Установить OInt
- | run: |
- | cd ./src/" + Язык + "/OInt
- | opm build
- | opm install *.ospx
- |
- | - name: Записать артефакт
- | uses: actions/upload-artifact@v4
- | with:
- | name: oint
- | path: ./src/" + Язык + "/OInt/*.ospx
|");
КонецПроцедуры
diff --git a/service/localization_vars/en.json b/service/localization_vars/en.json
index aa04b9e044..a5759aeab6 100644
--- a/service/localization_vars/en.json
+++ b/service/localization_vars/en.json
@@ -3,6 +3,7 @@
"synonymString":"Synonym",
"sectionsString":"Section",
"testsModule":"OPI_Tests",
+ "testsModuleCLI":"OPI_TestsCLI",
"testsTableMethod":"OPI_TestDataRetrieval.GetTestTable()",
"testsSectionsMethod":"OPI_TestDataRetrieval.GetTestingSectionMapping()",
"testsSectionsMethodGA":"OPI_TestDataRetrieval.GetTestingSectionMappingGA()",
diff --git a/service/localization_vars/ru.json b/service/localization_vars/ru.json
index d61efc5eef..340d92e840 100644
--- a/service/localization_vars/ru.json
+++ b/service/localization_vars/ru.json
@@ -3,6 +3,7 @@
"synonymString":"Синоним",
"sectionsString":"Раздел",
"testsModule":"OPI_Тесты",
+ "testsModuleCLI":"OPI_ТестыCLI",
"testsTableMethod":"OPI_ПолучениеДанныхТестов.ПолучитьТаблицуТестов()",
"testsSectionsMethod":"OPI_ПолучениеДанныхТестов.ПолучитьСоответствиеРазделовТестирования()",
"testsSectionsMethodGA":"OPI_ПолучениеДанныхТестов.ПолучитьСоответствиеРазделовТестированияGA()",