From 21e4535d2ecdb16b4dbb34cfb8871c27e399d2cd Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 11:38:43 +0300 Subject: [PATCH 1/7] fix param name --- .../useIbcmd.os" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/src/\320\232\320\273\320\260\321\201\321\201\321\213/useIbcmd.os" "b/src/\320\232\320\273\320\260\321\201\321\201\321\213/useIbcmd.os" index 63d25ff..8098fd7 100644 --- "a/src/\320\232\320\273\320\260\321\201\321\201\321\213/useIbcmd.os" +++ "b/src/\320\232\320\273\320\260\321\201\321\201\321\213/useIbcmd.os" @@ -413,7 +413,7 @@ Если ЗначениеЗаполнено(Пользователь) Тогда Команда.ДобавитьПараметр(СтрШаблон("--user=%1", Пользователь)); Если ЗначениеЗаполнено(Пароль) Тогда - Команда.ДобавитьПараметр(СтрШаблон("--pwd=%1", Пароль)); + Команда.ДобавитьПараметр(СтрШаблон("--password=%1", Пароль)); КонецЕсли; КонецЕсли; From 0fc3b87551282afe8825913daa71f5abac097b71 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 12:42:49 +0300 Subject: [PATCH 2/7] maximize space, rm libstdc --- .github/workflows/testing.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 8340a24..c3b910c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -25,6 +25,15 @@ jobs: locale: ['ru_RU'] fail-fast: false steps: + - name: Освобождение места + if: startsWith(matrix.os, 'ubuntu') + uses: easimon/maximize-build-space@master + with: + remove-android: 'true' + remove-haskell: 'true' + remove-codeql: 'true' + remove-docker-images: 'true' + - name: Установка локали if: matrix.os == startsWith(matrix.os, 'windows') run: | @@ -56,6 +65,7 @@ jobs: sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y locales libwebkit2gtk-4.0-37 sudo localedef -i ${{ matrix.locale }} -c -f UTF-8 -A /usr/share/locale/locale.alias ${{ matrix.locale }}.UTF-8 + sudo rm /opt/1C/v8.3/x86_64/libstdc++.so.6 - name: Установка libenchant1c2a для 8.3.21 (Linux) if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.v8_version, '8.3.21') From 7b6b46954c8b47a4559663bd01d0d5d095e3703a Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 12:56:52 +0300 Subject: [PATCH 3/7] revert rm --- .github/workflows/testing.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index c3b910c..0cf5724 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -65,7 +65,6 @@ jobs: sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y locales libwebkit2gtk-4.0-37 sudo localedef -i ${{ matrix.locale }} -c -f UTF-8 -A /usr/share/locale/locale.alias ${{ matrix.locale }}.UTF-8 - sudo rm /opt/1C/v8.3/x86_64/libstdc++.so.6 - name: Установка libenchant1c2a для 8.3.21 (Linux) if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.v8_version, '8.3.21') From cb7bf738adfa44902ddd385e90f5861f352b7427 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 14:00:56 +0300 Subject: [PATCH 4/7] reduce swap --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 0cf5724..967d8a4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -29,6 +29,7 @@ jobs: if: startsWith(matrix.os, 'ubuntu') uses: easimon/maximize-build-space@master with: + swap-size-mb: 1024 remove-android: 'true' remove-haskell: 'true' remove-codeql: 'true' From 5e092ba556341345cd0da0f518d05aedfaeeb5e4 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 14:08:53 +0300 Subject: [PATCH 5/7] increase root size --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 967d8a4..6f9ab20 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -29,6 +29,7 @@ jobs: if: startsWith(matrix.os, 'ubuntu') uses: easimon/maximize-build-space@master with: + root-reserve-mb: 10240 swap-size-mb: 1024 remove-android: 'true' remove-haskell: 'true' From d6b4e85e7c20dee0bb6f942cff6a1e844563e3af Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 14:19:27 +0300 Subject: [PATCH 6/7] increase root size --- .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 6f9ab20..008ea45 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -29,7 +29,7 @@ jobs: if: startsWith(matrix.os, 'ubuntu') uses: easimon/maximize-build-space@master with: - root-reserve-mb: 10240 + root-reserve-mb: 20480 swap-size-mb: 1024 remove-android: 'true' remove-haskell: 'true' From ebb6a2eb139b8874a21a29415cccf3132420e9cc Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 29 Sep 2025 15:46:14 +0300 Subject: [PATCH 7/7] switch to original onec-setup-action --- .github/workflows/qa.yml | 4 ++-- .github/workflows/testing.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 5697e17..16c69b0 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -62,7 +62,7 @@ jobs: sudo apt install wine -y - name: Установка платформы 1С - uses: ovcharenko-di/onec-setup-action@fix/cache-ring-commands-cfg + uses: 1CDevFlow/onec-setup-action with: type: onec # Тип устанавливаемого приложения onec_version: ${{ matrix.v8_version }} @@ -79,7 +79,7 @@ jobs: java-version: '17' - name: Установка EDT - uses: ovcharenko-di/onec-setup-action@fix/cache-ring-commands-cfg + uses: 1CDevFlow/onec-setup-action with: type: edt edt_version: ${{ matrix.edt_version }} diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 008ea45..fd66eb6 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -83,7 +83,7 @@ jobs: sudo apt install wine -y - name: Установка платформы 1С - uses: ovcharenko-di/onec-setup-action@fix/cache-ring-commands-cfg + uses: 1CDevFlow/onec-setup-action with: type: onec # Тип устанавливаемого приложения onec_version: ${{ matrix.v8_version }} @@ -108,7 +108,7 @@ jobs: java-version: '17' - name: Установка EDT - uses: ovcharenko-di/onec-setup-action@fix/cache-ring-commands-cfg + uses: 1CDevFlow/onec-setup-action with: type: edt edt_version: ${{ matrix.edt_version }}