From c4e2d04290eaa32174e27f67e5aeb9edc6ba8986 Mon Sep 17 00:00:00 2001 From: Anton Titovets Date: Mon, 7 Apr 2025 13:31:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BD=D1=8F=D1=82=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=BC=D0=B5=D1=80=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/oint_test_full_en.yml | 52 +++++++++---------- .github/workflows/oint_test_full_ru.yml | 52 +++++++++---------- .github/workflows/testcl.yml | 2 +- ci/cli_ostesten | 4 +- ci/cli_ostestru | 4 +- ci/clitesten | 4 +- ci/clitestru | 4 +- ci/main | 4 +- ci/opm_push | 6 +-- ci/opm_update | 4 +- ci/os/cli_testmaker.os | 4 +- ci/os/cli_testmaker_en.os | 4 +- .../Modules/МетодыФормированияТестовGA.os | 2 +- .../МетодыФормированияТестовJenkins.os | 4 +- ci/os/releasemaker.os | 2 +- ci/ostesten | 4 +- ci/ostestru | 4 +- ci/release | 2 +- service/iss/en.iss | 2 +- service/iss/ru.iss | 2 +- service/project.json | 2 +- src/en/OInt/packagedef | 2 +- .../OPI/src/Configuration/Configuration.mdo | 2 +- src/en/cli/data/Classes/СоставБиблиотеки.os | 2 +- src/en/cli/packagedef | 2 +- src/ru/OInt/packagedef | 2 +- .../OPI/src/Configuration/Configuration.mdo | 2 +- src/ru/cli/data/Classes/СоставБиблиотеки.os | 2 +- src/ru/cli/packagedef | 2 +- 29 files changed, 92 insertions(+), 92 deletions(-) diff --git a/.github/workflows/oint_test_full_en.yml b/.github/workflows/oint_test_full_en.yml index 00ce7de5aee..4ef7eb67496 100644 --- a/.github/workflows/oint_test_full_en.yml +++ b/.github/workflows/oint_test_full_en.yml @@ -54,7 +54,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -180,7 +180,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -298,7 +298,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -344,7 +344,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -398,7 +398,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -444,7 +444,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -490,7 +490,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -536,7 +536,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -578,7 +578,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -656,7 +656,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -706,7 +706,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -760,7 +760,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -818,7 +818,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -868,7 +868,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -922,7 +922,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -984,7 +984,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1038,7 +1038,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1108,7 +1108,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1210,7 +1210,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1260,7 +1260,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1326,7 +1326,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1372,7 +1372,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1422,7 +1422,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1472,7 +1472,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1522,7 +1522,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1564,7 +1564,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" diff --git a/.github/workflows/oint_test_full_ru.yml b/.github/workflows/oint_test_full_ru.yml index 858240ffae0..b0c24947aff 100644 --- a/.github/workflows/oint_test_full_ru.yml +++ b/.github/workflows/oint_test_full_ru.yml @@ -54,7 +54,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -180,7 +180,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -298,7 +298,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -344,7 +344,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -398,7 +398,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -444,7 +444,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -490,7 +490,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -536,7 +536,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -578,7 +578,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -656,7 +656,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -706,7 +706,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -760,7 +760,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -818,7 +818,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -868,7 +868,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -922,7 +922,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -984,7 +984,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1038,7 +1038,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1108,7 +1108,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1210,7 +1210,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1260,7 +1260,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1326,7 +1326,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1372,7 +1372,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1422,7 +1422,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1472,7 +1472,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1522,7 +1522,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1564,7 +1564,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" diff --git a/.github/workflows/testcl.yml b/.github/workflows/testcl.yml index e77919c472a..7e13d7375f7 100644 --- a/.github/workflows/testcl.yml +++ b/.github/workflows/testcl.yml @@ -13,7 +13,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" diff --git a/ci/cli_ostesten b/ci/cli_ostesten index 9eb0a21961c..6c6f987530a 100644 --- a/ci/cli_ostesten +++ b/ci/cli_ostesten @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/cli_ostestru b/ci/cli_ostestru index aeddf8bfd42..7042d8f1e73 100644 --- a/ci/cli_ostestru +++ b/ci/cli_ostestru @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/clitesten b/ci/clitesten index c068a6ded45..7f6e2497fd4 100644 --- a/ci/clitesten +++ b/ci/clitesten @@ -4,7 +4,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/en/cli/core/Classes/app.os oint.exe' } } @@ -3191,7 +3191,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/en/cli/core/Classes/app.os oint.exe' } } diff --git a/ci/clitestru b/ci/clitestru index 9e5e1a25b04..a237bb2e65d 100644 --- a/ci/clitestru +++ b/ci/clitestru @@ -4,7 +4,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/ru/cli/core/Classes/app.os oint.exe' } } @@ -3191,7 +3191,7 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' powershell encoding: 'UTF-8', script:'oscript -make ./src/ru/cli/core/Classes/app.os oint.exe' } } diff --git a/ci/main b/ci/main index 349c3c966e6..88ce09fe612 100644 --- a/ci/main +++ b/ci/main @@ -24,8 +24,8 @@ pipeline { stage('Local update'){ steps { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.21.0.ospx; del oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.22.0.ospx; del oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' } } diff --git a/ci/opm_push b/ci/opm_push index ed9480a2081..a2356f772c5 100644 --- a/ci/opm_push +++ b/ci/opm_push @@ -5,10 +5,10 @@ pipeline { steps { withCredentials([string(credentialsId: 'opm-token', variable: 'TOKEN')]) { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm push --token $ENV:TOKEN --channel stable --file oint-1.21.0.ospx; del oint-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm push --token $ENV:TOKEN --channel stable --file oint-1.22.0.ospx; del oint-1.22.0.ospx' powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build;' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm push --token $ENV:TOKEN --channel stable --file oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm push --token $ENV:TOKEN --channel stable --file oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' } } diff --git a/ci/opm_update b/ci/opm_update index aadbba5111a..2d8367bcf55 100644 --- a/ci/opm_update +++ b/ci/opm_update @@ -5,8 +5,8 @@ pipeline { steps { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.21.0.ospx; del oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.22.0.ospx; del oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' } diff --git a/ci/os/cli_testmaker.os b/ci/os/cli_testmaker.os index 70af3f7d02f..5388091ede9 100644 --- a/ci/os/cli_testmaker.os +++ b/ci/os/cli_testmaker.os @@ -45,7 +45,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } @@ -78,7 +78,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } diff --git a/ci/os/cli_testmaker_en.os b/ci/os/cli_testmaker_en.os index b256d265951..c5c7cb162c3 100644 --- a/ci/os/cli_testmaker_en.os +++ b/ci/os/cli_testmaker_en.os @@ -45,7 +45,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } @@ -78,7 +78,7 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' | powershell encoding: 'UTF-8', script:'oscript -make ./src/" + Язык + "/cli/core/Classes/app.os oint.exe' | } | } diff --git a/ci/os/internal/Modules/МетодыФормированияТестовGA.os b/ci/os/internal/Modules/МетодыФормированияТестовGA.os index 3e6b26dcecd..50614773b90 100644 --- a/ci/os/internal/Modules/МетодыФормированияТестовGA.os +++ b/ci/os/internal/Modules/МетодыФормированияТестовGA.os @@ -86,7 +86,7 @@ | - name: Установить OInt | run: | | TEMP_DEB=""$(mktemp)"" && - | wget -O ""$TEMP_DEB"" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.21.0/oint_1.21.0_all_" + Язык + ".deb' && + | wget -O ""$TEMP_DEB"" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.22.0/oint_1.22.0_all_" + Язык + ".deb' && | sudo dpkg -i ""$TEMP_DEB"" | rm -f ""$TEMP_DEB"" | diff --git a/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os b/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os index 583a306b694..feccf57ae67 100644 --- a/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os +++ b/ci/os/internal/Modules/МетодыФормированияТестовJenkins.os @@ -136,8 +136,8 @@ | stages { | stage('Prepare'){ | steps{ - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' - | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/cli; opm build; opm install oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' + | powershell encoding: 'UTF-8', script:'cd ./src/" + Язык + "/cli; opm build; opm install oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' | withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { | bat encoding: 'UTF-8', script:'""C:/Program Files (x86)/GnuPG/bin/gpg.exe"" --quiet --batch --yes --decrypt --passphrase=""%GPGKEY%"" --output ./data.json ./data.json.gpg' | } diff --git a/ci/os/releasemaker.os b/ci/os/releasemaker.os index fe9dd855eff..be3dfe56a5d 100644 --- a/ci/os/releasemaker.os +++ b/ci/os/releasemaker.os @@ -13,7 +13,7 @@ Процедура НачалоРаботы() Репозиторий = "https://github.com/Bayselonarrend/OpenIntegrations"; - Версия = "1.21.0"; + Версия = "1.22.0"; Режим = "CONFIG"; //Локальные данные diff --git a/ci/ostesten b/ci/ostesten index a819eaa4454..29b26983ef7 100644 --- a/ci/ostesten +++ b/ci/ostesten @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/cli; opm build; opm install oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/ostestru b/ci/ostestru index 74243f19812..02490b28f11 100644 --- a/ci/ostestru +++ b/ci/ostestru @@ -3,8 +3,8 @@ pipeline { stages { stage('Prepare'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.21.0.ospx; del oint-1.21.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.21.0.ospx; del oint-cli-1.21.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.22.0.ospx; del oint-1.22.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install oint-cli-1.22.0.ospx; del oint-cli-1.22.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'"C:/Program Files (x86)/GnuPG/bin/gpg.exe" --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/release b/ci/release index 45a73350397..6e9c29180e0 100644 --- a/ci/release +++ b/ci/release @@ -5,7 +5,7 @@ pipeline { stage('Release') { steps { bat 'oscript ./ci/os/releasemaker.os' - archiveArtifacts artifacts: '1.21.0/*' + archiveArtifacts artifacts: '1.22.0/*' } } } diff --git a/service/iss/en.iss b/service/iss/en.iss index b99e4d1feee..2b40b4f59d5 100644 --- a/service/iss/en.iss +++ b/service/iss/en.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.21.0" +#define MyAppVersion "1.22.0" #define MyAppPublisher "bayselonarrend" #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.bat" diff --git a/service/iss/ru.iss b/service/iss/ru.iss index 16bfb6159f3..c26a3594f2c 100644 --- a/service/iss/ru.iss +++ b/service/iss/ru.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.21.0" +#define MyAppVersion "1.22.0" #define MyAppPublisher "bayselonarrend" #define MyAppURL "https://github.com/Bayselonarrend/OpenIntegrations" #define MyAppExeName "oint.bat" diff --git a/service/project.json b/service/project.json index ab154d1ee60..8cd97168a34 100644 --- a/service/project.json +++ b/service/project.json @@ -1,5 +1,5 @@ { -"version": "1.21.0", +"version": "1.22.0", "root": "./src/", "mainLang": "ru", "packageSrc": "OInt/", diff --git a/src/en/OInt/packagedef b/src/en/OInt/packagedef index 72a00157016..a41ba49f84f 100644 --- a/src/en/OInt/packagedef +++ b/src/en/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.21.0") + .Версия("1.22.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/en/OPI/src/Configuration/Configuration.mdo b/src/en/OPI/src/Configuration/Configuration.mdo index a3047fccec0..6f649d7657e 100644 --- a/src/en/OPI/src/Configuration/Configuration.mdo +++ b/src/en/OPI/src/Configuration/Configuration.mdo @@ -25,7 +25,7 @@ PersonalComputer English Bayselonarrend - 1.21.0 + 1.22.0 en The Open Integration Package is a set of libraries for integrating with some popular APIs for 1C:Enterprise. It consists of common modules, each responsible for its own API, as well as several shared tool modules.. diff --git a/src/en/cli/data/Classes/СоставБиблиотеки.os b/src/en/cli/data/Classes/СоставБиблиотеки.os index 78b4645501b..9f5cb123689 100644 --- a/src/en/cli/data/Classes/СоставБиблиотеки.os +++ b/src/en/cli/data/Classes/СоставБиблиотеки.os @@ -1,7 +1,7 @@ #Использовать "./internal" Функция ПолучитьВерсию() Экспорт - Возврат "1.21.0"; + Возврат "1.22.0"; КонецФункции Функция ПолучитьСоответствиеКомандМодулей() Экспорт diff --git a/src/en/cli/packagedef b/src/en/cli/packagedef index a85f6ecd1f7..c949ae9bdd6 100644 --- a/src/en/cli/packagedef +++ b/src/en/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.21.0") + .Версия("1.22.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("CLI версия Открытого пакета интеграций") diff --git a/src/ru/OInt/packagedef b/src/ru/OInt/packagedef index 72a00157016..a41ba49f84f 100644 --- a/src/ru/OInt/packagedef +++ b/src/ru/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.21.0") + .Версия("1.22.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/ru/OPI/src/Configuration/Configuration.mdo b/src/ru/OPI/src/Configuration/Configuration.mdo index 7b6d5bd3301..5a7724f0438 100644 --- a/src/ru/OPI/src/Configuration/Configuration.mdo +++ b/src/ru/OPI/src/Configuration/Configuration.mdo @@ -25,7 +25,7 @@ PersonalComputer Russian Bayselonarrend - 1.21.0 + 1.22.0 ru Открытый пакет интеграций - набор библиотек для интеграции с некоторыми популярными API для 1C:Enterprise. Он состоит из общих модулей, каждый из которых отвечает за свой API, а также нескольких модулей-инструментов, общих для всех. diff --git a/src/ru/cli/data/Classes/СоставБиблиотеки.os b/src/ru/cli/data/Classes/СоставБиблиотеки.os index 78b4645501b..9f5cb123689 100644 --- a/src/ru/cli/data/Classes/СоставБиблиотеки.os +++ b/src/ru/cli/data/Classes/СоставБиблиотеки.os @@ -1,7 +1,7 @@ #Использовать "./internal" Функция ПолучитьВерсию() Экспорт - Возврат "1.21.0"; + Возврат "1.22.0"; КонецФункции Функция ПолучитьСоответствиеКомандМодулей() Экспорт diff --git a/src/ru/cli/packagedef b/src/ru/cli/packagedef index a85f6ecd1f7..c949ae9bdd6 100644 --- a/src/ru/cli/packagedef +++ b/src/ru/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.21.0") + .Версия("1.22.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("CLI версия Открытого пакета интеграций")