diff --git a/.github/workflows/oint_test_full_en.yml b/.github/workflows/oint_test_full_en.yml index 209c720f22..8957bff73c 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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -582,7 +582,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -624,7 +624,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -702,7 +702,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -752,7 +752,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -806,7 +806,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -864,7 +864,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -914,7 +914,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -968,7 +968,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1030,7 +1030,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1084,7 +1084,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1154,7 +1154,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1256,7 +1256,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1306,7 +1306,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1418,7 +1418,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1468,7 +1468,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1518,7 +1518,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1568,7 +1568,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1610,7 +1610,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1672,7 +1672,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1722,7 +1722,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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 6585a261fe..3d9d0b9c22 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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -582,7 +582,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -624,7 +624,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -702,7 +702,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -752,7 +752,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -806,7 +806,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -864,7 +864,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -914,7 +914,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -968,7 +968,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1030,7 +1030,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1084,7 +1084,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1154,7 +1154,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1256,7 +1256,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1306,7 +1306,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1418,7 +1418,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1468,7 +1468,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1518,7 +1518,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1568,7 +1568,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1610,7 +1610,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1672,7 +1672,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" @@ -1722,7 +1722,7 @@ jobs: - name: Установить OInt run: | TEMP_DEB="$(mktemp)" && - wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.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 63175da807..51764b180b 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.26.0/oint_1.26.0_all_ru.deb' && + wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb' && sudo dpkg -i "$TEMP_DEB" rm -f "$TEMP_DEB" diff --git a/ci/cli_deb_test_en b/ci/cli_deb_test_en index 7007765d48..6c3a768434 100644 --- a/ci/cli_deb_test_en +++ b/ci/cli_deb_test_en @@ -25,7 +25,7 @@ pipeline { steps { script { // Скачиваем новый deb-пакет oint - sh 'wget -O oint_1.26.0_all_en.deb https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_en.deb ' + sh 'wget -O oint_1.27.0_all_en.deb https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_en.deb ' } } } @@ -34,7 +34,7 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'dpkg -i oint_1.26.0_all_en.deb' + sh 'dpkg -i oint_1.27.0_all_en.deb' } } } diff --git a/ci/cli_deb_test_ru b/ci/cli_deb_test_ru index 6af02b61a4..a6cefa11de 100644 --- a/ci/cli_deb_test_ru +++ b/ci/cli_deb_test_ru @@ -25,7 +25,7 @@ pipeline { steps { script { // Скачиваем новый deb-пакет oint - sh 'wget -O oint_1.26.0_all_ru.deb https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_ru.deb ' + sh 'wget -O oint_1.27.0_all_ru.deb https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_ru.deb ' } } } @@ -34,7 +34,7 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'dpkg -i oint_1.26.0_all_ru.deb' + sh 'dpkg -i oint_1.27.0_all_ru.deb' } } } diff --git a/ci/cli_rpm_test_en b/ci/cli_rpm_test_en index f7bda01e34..01e6578b63 100644 --- a/ci/cli_rpm_test_en +++ b/ci/cli_rpm_test_en @@ -24,7 +24,7 @@ pipeline { steps { script { // Скачиваем новый rpm-пакет oint - sh 'wget -O oint-1.26.0-1.noarch_en.rpm https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint-1.26.0-1.noarch_en.rpm ' + sh 'wget -O oint-1.27.0-1.noarch_en.rpm https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint-1.27.0-1.noarch_en.rpm ' } } } @@ -33,7 +33,7 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'rpm -ivh --replacepkgs oint-1.26.0-1.noarch_en.rpm' + sh 'rpm -ivh --replacepkgs oint-1.27.0-1.noarch_en.rpm' } } } diff --git a/ci/cli_rpm_test_ru b/ci/cli_rpm_test_ru index 64bd3cc028..e17a2e064c 100644 --- a/ci/cli_rpm_test_ru +++ b/ci/cli_rpm_test_ru @@ -24,7 +24,7 @@ pipeline { steps { script { // Скачиваем новый rpm-пакет oint - sh 'wget -O oint-1.26.0-1.noarch_ru.rpm https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint-1.26.0-1.noarch_ru.rpm ' + sh 'wget -O oint-1.27.0-1.noarch_ru.rpm https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint-1.27.0-1.noarch_ru.rpm ' } } } @@ -33,7 +33,7 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'rpm -ivh --replacepkgs oint-1.26.0-1.noarch_ru.rpm' + sh 'rpm -ivh --replacepkgs oint-1.27.0-1.noarch_ru.rpm' } } } diff --git a/ci/cli_test_en b/ci/cli_test_en index 641e1aeaaa..29bf9b3b3f 100644 --- a/ci/cli_test_en +++ b/ci/cli_test_en @@ -79,7 +79,7 @@ pipeline { stage('Download Installer') { steps { powershell encoding: 'UTF-8', script: ''' - $url = "https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_installer_en.exe " + $url = "https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_installer_en.exe " $output = "$env:USERPROFILE\\Downloads\\oint_installer.exe" Invoke-WebRequest -Uri $url -OutFile $output Write-Host "Инсталлер скачан в: $output" diff --git a/ci/cli_test_ru b/ci/cli_test_ru index 33f9b00d97..b563a6cb9d 100644 --- a/ci/cli_test_ru +++ b/ci/cli_test_ru @@ -79,7 +79,7 @@ pipeline { stage('Download Installer') { steps { powershell encoding: 'UTF-8', script: ''' - $url = "https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_installer_ru.exe " + $url = "https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_installer_ru.exe " $output = "$env:USERPROFILE\\Downloads\\oint_installer.exe" Invoke-WebRequest -Uri $url -OutFile $output Write-Host "Инсталлер скачан в: $output" diff --git a/ci/main b/ci/main index 1f470cc57d..f530e46468 100644 --- a/ci/main +++ b/ci/main @@ -26,8 +26,8 @@ pipeline { stage('Local update'){ steps { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.26.0.ospx; del oint-1.26.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.26.0.ospx; del oint-cli-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.27.0.ospx; del oint-1.27.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.27.0.ospx; del oint-cli-1.27.0.ospx' } } diff --git a/ci/opm_push b/ci/opm_push index c50792fa7b..16f3591ebf 100644 --- a/ci/opm_push +++ b/ci/opm_push @@ -7,10 +7,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.26.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm push --token $ENV:TOKEN --channel stable --file oint-1.26.0.ospx; del oint-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.27.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm push --token $ENV:TOKEN --channel stable --file oint-1.27.0.ospx; del oint-1.27.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.26.0.ospx; del oint-cli-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm push --token $ENV:TOKEN --channel stable --file oint-cli-1.27.0.ospx; del oint-cli-1.27.0.ospx' } } diff --git a/ci/opm_update b/ci/opm_update index 3b412a5b67..1174c7c734 100644 --- a/ci/opm_update +++ b/ci/opm_update @@ -7,8 +7,8 @@ pipeline { steps { - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.26.0.ospx; del oint-1.26.0.ospx' - powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.26.0.ospx; del oint-cli-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install -f oint-1.27.0.ospx; del oint-1.27.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/cli; opm build; opm install -f oint-cli-1.27.0.ospx; del oint-cli-1.27.0.ospx' } diff --git a/ci/os/releasemaker.os b/ci/os/releasemaker.os index aedfff88ce..009f70c156 100644 --- a/ci/os/releasemaker.os +++ b/ci/os/releasemaker.os @@ -12,7 +12,7 @@ Процедура НачалоРаботы() Репозиторий = "https://github.com/Bayselonarrend/OpenIntegrations"; - Версия = "1.26.0"; + Версия = "1.27.0"; Режим = "CONFIG"; //Локальные данные diff --git a/ci/os_deb_test_en b/ci/os_deb_test_en index ac17796ced..f36e4bc199 100644 --- a/ci/os_deb_test_en +++ b/ci/os_deb_test_en @@ -50,7 +50,7 @@ pipeline { stage('Prepare'){ steps{ - sh 'cd ./src/en/OInt && opm build && opm install oint-1.26.0.ospx && rm oint-1.26.0.ospx' + sh 'cd ./src/en/OInt && opm build && opm install oint-1.27.0.ospx && rm oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/ci/os_deb_test_ru b/ci/os_deb_test_ru index 7de61083be..8d362aaf5c 100644 --- a/ci/os_deb_test_ru +++ b/ci/os_deb_test_ru @@ -50,7 +50,7 @@ pipeline { stage('Prepare'){ steps{ - sh 'cd ./src/ru/OInt && opm build && opm install oint-1.26.0.ospx && rm oint-1.26.0.ospx' + sh 'cd ./src/ru/OInt && opm build && opm install oint-1.27.0.ospx && rm oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/ci/os_rpm_test_en b/ci/os_rpm_test_en index 63e393506e..771bda4db4 100644 --- a/ci/os_rpm_test_en +++ b/ci/os_rpm_test_en @@ -50,7 +50,7 @@ pipeline { stage('Prepare'){ steps{ - sh 'cd ./src/en/OInt && opm build && opm install oint-1.26.0.ospx && rm oint-1.26.0.ospx' + sh 'cd ./src/en/OInt && opm build && opm install oint-1.27.0.ospx && rm oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/ci/os_rpm_test_ru b/ci/os_rpm_test_ru index ba93a0e3e2..e733e6d447 100644 --- a/ci/os_rpm_test_ru +++ b/ci/os_rpm_test_ru @@ -50,7 +50,7 @@ pipeline { stage('Prepare'){ steps{ - sh 'cd ./src/ru/OInt && opm build && opm install oint-1.26.0.ospx && rm oint-1.26.0.ospx' + sh 'cd ./src/ru/OInt && opm build && opm install oint-1.27.0.ospx && rm oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/ci/os_test_en b/ci/os_test_en index 337b6db587..e9d1deea29 100644 --- a/ci/os_test_en +++ b/ci/os_test_en @@ -48,7 +48,7 @@ pipeline { } stage('Build OInt from source and decrypt secret data'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.26.0.ospx; del oint-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/en/OInt; opm build; opm install oint-1.27.0.ospx; del oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'gpg --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/os_test_ru b/ci/os_test_ru index 562f5fe4fa..3fb9f88ff0 100644 --- a/ci/os_test_ru +++ b/ci/os_test_ru @@ -48,7 +48,7 @@ pipeline { } stage('Build OInt from source and decrypt secret data'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.26.0.ospx; del oint-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/ru/OInt; opm build; opm install oint-1.27.0.ospx; del oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'gpg --quiet --batch --yes --decrypt --passphrase="%GPGKEY%" --output ./data.json ./data.json.gpg' } diff --git a/ci/release b/ci/release index 5cb22ccd68..a336033de1 100644 --- a/ci/release +++ b/ci/release @@ -8,7 +8,7 @@ pipeline { steps { powershell encoding: 'UTF-8', script:'Remove-Item -Path "./Melezh" -Recurse -Force' bat 'oscript ./ci/os/releasemaker.os' - archiveArtifacts artifacts: '1.26.0/*' + archiveArtifacts artifacts: '1.27.0/*' } } } diff --git a/service/iss/en.iss b/service/iss/en.iss index 5c935ca1ac..72a4bfbc04 100644 --- a/service/iss/en.iss +++ b/service/iss/en.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.26.0" +#define MyAppVersion "1.27.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 39171e53a1..4cb58d184c 100644 --- a/service/iss/ru.iss +++ b/service/iss/ru.iss @@ -1,5 +1,5 @@ #define MyAppName "OInt" -#define MyAppVersion "1.26.0" +#define MyAppVersion "1.27.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 8e4c248108..026b1ccf76 100644 --- a/service/project.json +++ b/service/project.json @@ -1,5 +1,5 @@ { -"version": "1.26.0", +"version": "1.27.0", "root": "./src/", "mainLang": "ru", "packageSrc": "OInt/", diff --git a/service/templates/jenkins/cli_test_deb.txt b/service/templates/jenkins/cli_test_deb.txt index cf19173509..0183abd16e 100644 --- a/service/templates/jenkins/cli_test_deb.txt +++ b/service/templates/jenkins/cli_test_deb.txt @@ -25,7 +25,7 @@ pipeline { steps { script { // Скачиваем новый deb-пакет oint - sh 'wget -O oint_1.26.0_all_%1.deb https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_all_%1.deb ' + sh 'wget -O oint_1.27.0_all_%1.deb https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_all_%1.deb ' } } } @@ -34,7 +34,7 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'dpkg -i oint_1.26.0_all_%1.deb' + sh 'dpkg -i oint_1.27.0_all_%1.deb' } } } diff --git a/service/templates/jenkins/cli_test_rpm.txt b/service/templates/jenkins/cli_test_rpm.txt index 0ba833735a..c7c2ec0213 100644 --- a/service/templates/jenkins/cli_test_rpm.txt +++ b/service/templates/jenkins/cli_test_rpm.txt @@ -24,7 +24,7 @@ pipeline { steps { script { // Скачиваем новый rpm-пакет oint - sh 'wget -O oint-1.26.0-1.noarch_%1.rpm https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint-1.26.0-1.noarch_%1.rpm ' + sh 'wget -O oint-1.27.0-1.noarch_%1.rpm https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint-1.27.0-1.noarch_%1.rpm ' } } } @@ -33,7 +33,7 @@ pipeline { steps { script { // Устанавливаем скаченный пакет - sh 'rpm -ivh --replacepkgs oint-1.26.0-1.noarch_%1.rpm' + sh 'rpm -ivh --replacepkgs oint-1.27.0-1.noarch_%1.rpm' } } } diff --git a/service/templates/jenkins/cli_test_windows.txt b/service/templates/jenkins/cli_test_windows.txt index c8f784fd11..4f09ada9a9 100644 --- a/service/templates/jenkins/cli_test_windows.txt +++ b/service/templates/jenkins/cli_test_windows.txt @@ -79,7 +79,7 @@ pipeline { stage('Download Installer') { steps { powershell encoding: 'UTF-8', script: ''' - $url = "https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.26.0/oint_1.26.0_installer_%1.exe " + $url = "https://jenkins.openintegrations.dev/job/OpiRelease/lastSuccessfulBuild/artifact/1.27.0/oint_1.27.0_installer_%1.exe " $output = "$env:USERPROFILE\\Downloads\\oint_installer.exe" Invoke-WebRequest -Uri $url -OutFile $output Write-Host "Инсталлер скачан в: $output" diff --git a/service/templates/jenkins/os_test_linux.txt b/service/templates/jenkins/os_test_linux.txt index e2b2f30765..3eefd9928e 100644 --- a/service/templates/jenkins/os_test_linux.txt +++ b/service/templates/jenkins/os_test_linux.txt @@ -50,7 +50,7 @@ pipeline { stage('Prepare'){ steps{ - sh 'cd ./src/%1/OInt && opm build && opm install oint-1.26.0.ospx && rm oint-1.26.0.ospx' + sh 'cd ./src/%1/OInt && opm build && opm install oint-1.27.0.ospx && rm oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { sh 'gpg --quiet --batch --yes --decrypt --passphrase="$GPGKEY" --output ./data.json ./data.json.gpg' } diff --git a/service/templates/jenkins/os_test_windows.txt b/service/templates/jenkins/os_test_windows.txt index f3b54f376c..0880c831fa 100644 --- a/service/templates/jenkins/os_test_windows.txt +++ b/service/templates/jenkins/os_test_windows.txt @@ -48,7 +48,7 @@ pipeline { } stage('Build OInt from source and decrypt secret data'){ steps{ - powershell encoding: 'UTF-8', script:'cd ./src/%1/OInt; opm build; opm install oint-1.26.0.ospx; del oint-1.26.0.ospx' + powershell encoding: 'UTF-8', script:'cd ./src/%1/OInt; opm build; opm install oint-1.27.0.ospx; del oint-1.27.0.ospx' withCredentials([string(credentialsId: 'gpgkey', variable: 'GPGKEY')]) { bat encoding: 'UTF-8', script:'gpg --quiet --batch --yes --decrypt --passphrase="%%GPGKEY%%" --output ./data.json ./data.json.gpg' } diff --git a/src/addins/ftp/src/component/ftp_client.rs b/src/addins/ftp/src/component/ftp_client.rs new file mode 100644 index 0000000000..ac3466c90d --- /dev/null +++ b/src/addins/ftp/src/component/ftp_client.rs @@ -0,0 +1,47 @@ +use serde_json::json; +use suppaftp::{FtpStream, NativeTlsFtpStream}; + +pub enum FtpClient { + Secure(NativeTlsFtpStream), + Insecure(FtpStream), +} + +impl FtpClient { + + pub fn login(self, user: Option<&str>, pass: Option<&str>) -> Result { + + let user = match user { + Some(u) => u, + None => return Ok(self), + }; + + let pass = pass.unwrap_or_else(|| ""); + + match self { + FtpClient::Secure(mut stream) => { + + match stream.login(user, pass){ + Ok(_) => Ok(FtpClient::Secure(stream)), + Err(e) => Err(format_json_error(&e.to_string())) + } + + } + FtpClient::Insecure(mut stream) => { + match stream.login(user, pass){ + Ok(_) => Ok(FtpClient::Insecure(stream)), + Err(e) => Err(format_json_error(&e.to_string())) + } + } + } + + } +} + +fn format_json_error(error: E) -> String { + let error_message = error.to_string(); + let json_obj = json!({ + "result": false, + "error": error_message, + }); + json_obj.to_string() +} \ No newline at end of file diff --git a/src/en/OInt/packagedef b/src/en/OInt/packagedef index 0e7a2c759c..bca237adec 100644 --- a/src/en/OInt/packagedef +++ b/src/en/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.26.0") + .Версия("1.27.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 f5afc647c5..e97c51af91 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.26.0 + 1.27.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/LibraryComposition.os b/src/en/cli/data/Classes/LibraryComposition.os index c086f4e552..7e973d920d 100644 --- a/src/en/cli/data/Classes/LibraryComposition.os +++ b/src/en/cli/data/Classes/LibraryComposition.os @@ -9,7 +9,7 @@ Var PackagesDirectory; Procedure OnObjectCreate() - Version = "1.26.0"; + Version = "1.27.0"; InitializeCommonLists(); CurrentDirectory = CurrentScript().Path; diff --git a/src/en/cli/packagedef b/src/en/cli/packagedef index 5783487bfd..8ad3f1eaf3 100644 --- a/src/en/cli/packagedef +++ b/src/en/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.26.0") + .Версия("1.27.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("OpenIntegrations-based CLI tool") diff --git a/src/ru/OInt/packagedef b/src/ru/OInt/packagedef index 0e7a2c759c..bca237adec 100644 --- a/src/ru/OInt/packagedef +++ b/src/ru/OInt/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint") - .Версия("1.26.0") + .Версия("1.27.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("Открытый пакет интеграций с популярными API") diff --git a/src/ru/OPI/src/CommonModules/OPI_ТестыCLI/Module.bsl b/src/ru/OPI/src/CommonModules/OPI_ТестыCLI/Module.bsl index 179d806f0d..f7af89e59c 100644 --- a/src/ru/OPI/src/CommonModules/OPI_ТестыCLI/Module.bsl +++ b/src/ru/OPI/src/CommonModules/OPI_ТестыCLI/Module.bsl @@ -2893,7 +2893,14 @@ OPI_Инструменты.ДобавитьПоле("Telegram_ChannelMessageID", IDСообщения, "Строка", ПараметрыФункции); // Дополнительный тест 1 - Опции.Вставить("text", "Текст html %%F0%%9F%%93%%9E 10%%"); + + Если OPI_Инструменты.ЭтоWindows() Тогда + Текст = "Текст html %%F0%%9F%%93%%9E 10%%"; + Иначе + Текст = "Текст html %F0%9F%93%9E 10%"; + КонецЕсли; + + Опции.Вставить("text", Текст); Опции.Вставить("parsemode", "HTML"); Результат = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("telegram", "ОтправитьТекстовоеСообщение", Опции); @@ -2902,7 +2909,14 @@ OPI_ПолучениеДанныхТестов.Проверка_ТелеграмОк(Результат); // Дополнительный тест 2 - Опции.Вставить("text", "%%F0%%9F%%A4%%BC"); + + Если OPI_Инструменты.ЭтоWindows() Тогда + Текст = "%%F0%%9F%%A4%%BC"; + Иначе + Текст = "%F0%9F%A4%BC"; + КонецЕсли; + + Опции.Вставить("text", Текст); Опции.Вставить("parsemode", "Markdown"); Результат = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("telegram", "ОтправитьТекстовоеСообщение", Опции); @@ -2911,6 +2925,13 @@ OPI_ПолучениеДанныхТестов.Проверка_ТелеграмОк(Результат); // Дополнительный тест 3 + + Если OPI_Инструменты.ЭтоWindows() Тогда + Текст = "Текст %%F0%%9F%%A5%%9D и emoji \(10%%\)"; + Иначе + Текст = "Текст %F0%9F%A5%9D и emoji \(10%\)"; + КонецЕсли; + Опции.Вставить("text", "Текст %%F0%%9F%%A5%%9D и emoji \(10%%\)"); Опции.Вставить("parsemode", "MarkdownV2"); Результат = OPI_ПолучениеДанныхТестов.ВыполнитьТестCLI("telegram", "ОтправитьТекстовоеСообщение", Опции); diff --git a/src/ru/OPI/src/Configuration/Configuration.mdo b/src/ru/OPI/src/Configuration/Configuration.mdo index 1725b164a9..802e7f7ecb 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.26.0 + 1.27.0 ru Открытый пакет интеграций - набор библиотек для интеграции с некоторыми популярными API для 1C:Enterprise. Он состоит из общих модулей, каждый из которых отвечает за свой API, а также нескольких модулей-инструментов, общих для всех. @@ -39,17 +39,19 @@ https://github.com/Bayselonarrend/OpenIntegrations Subsystem.OPI_Интеграция + CommonTemplate.OPI_Cryptography + CommonTemplate.OPI_FTP + CommonTemplate.OPI_MSSQL CommonTemplate.OPI_MySQL CommonTemplate.OPI_PostgreSQL CommonTemplate.OPI_RCON CommonTemplate.OPI_SQLite CommonTemplate.OPI_TCPClient - CommonTemplate.OPI_Cryptography - CommonTemplate.OPI_MSSQL CommonModule.OPI_Airtable CommonModule.OPI_Bitrix24 CommonModule.OPI_CDEK CommonModule.OPI_Dropbox + CommonModule.OPI_FTP CommonModule.OPI_GoogleCalendar CommonModule.OPI_GoogleDrive CommonModule.OPI_GoogleSheets diff --git a/src/ru/cli/data/Classes/LibraryComposition.os b/src/ru/cli/data/Classes/LibraryComposition.os index 9e9310601a..030ca0da77 100644 --- a/src/ru/cli/data/Classes/LibraryComposition.os +++ b/src/ru/cli/data/Classes/LibraryComposition.os @@ -9,7 +9,7 @@ Процедура ПриСозданииОбъекта() - Версия = "1.26.0"; + Версия = "1.27.0"; ИнициализироватьОсновныеСписки(); ТекущийКаталог = ТекущийСценарий().Каталог; diff --git a/src/ru/cli/packagedef b/src/ru/cli/packagedef index 5783487bfd..8ad3f1eaf3 100644 --- a/src/ru/cli/packagedef +++ b/src/ru/cli/packagedef @@ -1,5 +1,5 @@ Описание.Имя("oint-cli") - .Версия("1.26.0") + .Версия("1.27.0") .Автор("bayselonarrend") .АдресАвтора("bayselonarrend@gmail.com") .Описание("OpenIntegrations-based CLI tool")