Upd master

.bsl-language-server.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://1c-syntax.github.io/bsl-language-server/configuration/schema.json",
+  "language": "ru",
+  "diagnostics": {
+    "parameters": {
+      "LineLength": {
+        "maxLineLength": 150
+      },
+      "MissingSpace": {
+        "allowMultipleCommas": true
+      },
+      "Typo": {
+        "minWordLength": 3,
+        "userWordsToIgnore": "Закоммитить,Коммитом,Коммита,Коммите,тэг,Тэг,Инкрементально,"
+      }
+    }
+  }
+}

.github/workflows/qa.yml

@@ -3,76 +3,153 @@
 # All rights reserved.
 
 name: Контроль качества
-# Любой пуш и pr в проекте но с фильтром по основному проекту
-on: [push, pull_request]
+
+on:
+  push:
+  pull_request_target:
+  workflow_dispatch:
+
 jobs:
-  build:
-    if: github.repository == 'khorevaa/gitsync-plugins'
+  sonar:
+    if: github.repository == 'oscript-library/gitsync-plugins'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        oscript_version: ['1.8.3']
+        os: [ubuntu-22.04]
+        oscript_version: ['1.9.2']
+        v8_version: ['8.3.24.1691']
+        edt_version: ['2024.2.5']
+        locale: ['ru_RU']
 
     steps:
-      # Загрузка проекта
+      - name: Освобождение места
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 20480
+          swap-size-mb: 1024
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'true'
+
       - name: Актуализация
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.2.2
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+          ref: ${{ github.event.pull_request.head.ref || github.ref_name }}
+          fetch-depth: 0
 
       # https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
       - name: Извлечение имени текущей ветки
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
         id: extract_branch
 
-      # Установка OneScript конкретной версии
       - name: Установка OneScript
-        uses: otymko/setup-onescript@v1.0
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+        uses: otymko/setup-onescript@v1.5
         with:
           version: ${{ matrix.oscript_version }}
 
-      # Установка зависимостей пакета
       - name: Установка зависимостей
         run: |
           opm install opm
           opm install --dev
-          opm install 1testrunner
-          opm install 1bdd 
-          opm install notify
-          opm install coverage
+          opm install gitsync # TODO: должно быть необязательно
+
+      - name: Подготовка окружения (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+            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
+
+      - name: Установка wine для Tool1CD (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install wine -y
+
+      - name: Установка платформы 1С
+        uses: 1CDevFlow/onec-setup-action@main
+        with:
+          type: onec # Тип устанавливаемого приложения
+          onec_version: ${{ matrix.v8_version }}
+          cache: true
+          cache_distr: true
+        env: 
+          ONEC_USERNAME: ${{ secrets.ONEC_USERNAME }}
+          ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD }}
+
+      - name: Установка Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Установка EDT
+        uses: 1CDevFlow/onec-setup-action@main
+        with:
+          type: edt
+          edt_version: ${{ matrix.edt_version }}
+          cache: true
+          cache_distr: true
+        env: 
+          ONEC_USERNAME: ${{ secrets.ONEC_USERNAME }}
+          ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD }}
+
+      - name: Установка лицензии (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          # Создание каталога
+          sudo mkdir -p /var/1C/licenses
+
+          # Запись лицензии в файл
+          echo "${{ secrets.ONEC_LICENSE }}" | sudo tee /var/1C/licenses/licence.lic > /dev/null
+
+          # Назначение прав
+          sudo chmod 777 -R /var/1C/licenses
+        shell: bash
+        env:
+          ONEC_LICENSE: ${{ secrets.ONEC_LICENSE }}
+
+      - name: Установка gitsync локально
+        run: opm run install-gitsync
 
-      # Запуск тестов и сбор покрытия кода
       - name: Покрытие кода
-        run: oscript ./tasks/coverage.os true
+        uses: coactions/setup-xvfb@v1
+        env:
+            EDT_VERSION: ${{ matrix.edt_version }}
+            GITSYNC_V8VERSION: ${{ matrix.v8_version }}
+        with:
+          run: opm run coverage
 
       - name: Извлечение версии пакета
         shell: bash
         run: echo "##[set-output name=version;]`cat packagedef | grep ".Версия(" | sed 's|[^"]*"||' | sed -r 's/".+//'`"
         id: extract_version
 
       - name: Установка Sonar-scanner
-        uses: warchant/setup-sonar-scanner@v1
+        uses: warchant/setup-sonar-scanner@v8
 
-      # Анализ проекта в SonarQube (ветка)
       - name: Анализ в SonarQube (branch)
-        if: github.event_name == 'push'
+        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+        env:
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
         run: sonar-scanner
-            -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }}
             -Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
             -Dsonar.branch.name=${{ steps.extract_branch.outputs.branch }}
             -Dsonar.projectVersion=${{ steps.extract_version.outputs.version }}
 
-      # Анализ проекта в SonarQube (PR)
       # https://docs.sonarqube.org/latest/analysis/pull-request/
       - name: Анализ в SonarQube (pull-request)
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
+        env:
+          SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
         run: sonar-scanner
-            -Dsonar.login=${{ secrets.SONARQUBE_TOKEN }}
             -Dsonar.host.url=${{ secrets.SONARQUBE_HOST }}
-            -Dsonar.branch.name=${{ steps.extract_branch.outputs.branch }}
             -Dsonar.pullrequest.key=${{ github.event.pull_request.number }}
             -Dsonar.pullrequest.branch=${{ github.event.pull_request.head.ref }}
             -Dsonar.pullrequest.base=${{ github.event.pull_request.base.ref }}

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        oscript_version: ['1.8.3']
+        oscript_version: ['1.9.2']
         package_mask: ["gitsync-plugins-*.ospx"]
 
     steps:

.github/workflows/testing.yml

@@ -3,46 +3,161 @@
 # All rights reserved.
 
 name: Тестирование
-# Любой пуш и pr в проекте
-on: [push, pull_request]
+
+on:
+  push:
+  pull_request_target:
+  workflow_dispatch:
+
+permissions:
+  checks: write
+  pull-requests: write
 
 jobs:
-  build:
+  test:
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        oscript_version: ['1.8.3']
-
+        oscript_version: ['1.9.2']
+        v8_version: ['8.3.21.1624', '8.3.24.1691']
+        edt_version: ['2023.3.6', '2024.2.5']
+        os: [windows-latest, ubuntu-22.04]
+        locale: ['ru_RU']
+      fail-fast: false
     steps:
-      # Загрузка проекта
+      - name: Освобождение места
+        if: startsWith(matrix.os, 'ubuntu')
+        uses: easimon/maximize-build-space@master
+        with:
+          root-reserve-mb: 20480
+          swap-size-mb: 1024
+          remove-android: 'true'
+          remove-haskell: 'true'
+          remove-codeql: 'true'
+          remove-docker-images: 'true'
+
+      - name: Установка локали
+        if: matrix.os == startsWith(matrix.os, 'windows')
+        run: |
+          powershell -Command "Set-WinUILanguageOverride -Language ru-RU"
+          powershell -Command "Set-WinUserLanguageList ru-RU -Force"
+          powershell -Command "Set-Culture ru-RU"
+          powershell -Command "Set-WinSystemLocale ru-RU"
+
       - name: Актуализация
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.2.2
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+          ref: ${{ github.event.pull_request.head.ref || github.ref_name }}
 
-      # Установка OneScript конкретной версии
       - name: Установка OneScript
-        env:
-          ACTIONS_ALLOW_UNSECURE_COMMANDS: true
-        uses: otymko/setup-onescript@v1.0
+        uses: otymko/setup-onescript@v1.5
         with:
           version: ${{ matrix.oscript_version }}
 
-      # Установка зависимостей пакета
       - name: Установка зависимостей
         run: |
           opm install opm
           opm install --dev
-          opm install 1testrunner
-          opm install 1bdd 
-          opm install notify
-          opm install coverage
-
-      # Задача тестирования, в результате ожидается успешное выполнение
-      - name: Тестирование Unit
-        run: oscript ./tasks/test.os true
-
-      # - name: Тестирование Integrated
-      #   run: | 
-      #     docker run -e OSCRIPT_VERSION=${{ matrix.oscript_version }} -v $(pwd):/work_dir harmit/ci-image sh -c 'cd /work_dir; sh /work_dir/travis-ci.sh; exit'
-      # grep 'Результат прогона тестов <Да>' /tmp/test.log
+          opm install gitsync # TODO: должно быть необязательно
+
+      - name: Подготовка окружения (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+            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
+
+      - name: Установка libenchant1c2a для 8.3.21 (Linux)
+        if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.v8_version, '8.3.21')
+        run: |
+            sudo echo "deb http://cz.archive.ubuntu.com/ubuntu focal main universe" | sudo tee -a /etc/apt/sources.list
+            sudo apt-get update
+            sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libenchant1c2a
+
+      - name: Установка wine для Tool1CD (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update
+          sudo apt install wine -y
+
+      - name: Установка платформы 1С
+        uses: 1CDevFlow/onec-setup-action@main
+        with:
+          type: onec # Тип устанавливаемого приложения
+          onec_version: ${{ matrix.v8_version }}
+          cache: true
+          cache_distr: true
+        env: 
+          ONEC_USERNAME: ${{ secrets.ONEC_USERNAME }}
+          ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD }}
+
+      - name: Установка Java 11
+        if: startsWith(matrix.edt_version, '2023')
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Установка Java 17
+        if: startsWith(matrix.edt_version, '2024')
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Установка EDT
+        uses: 1CDevFlow/onec-setup-action@main
+        with:
+          type: edt
+          edt_version: ${{ matrix.edt_version }}
+          cache: true
+          cache_distr: true
+        env: 
+          ONEC_USERNAME: ${{ secrets.ONEC_USERNAME }}
+          ONEC_PASSWORD: ${{ secrets.ONEC_PASSWORD }}
+
+      - name: Установка лицензии (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          # Создание каталога
+          sudo mkdir -p /var/1C/licenses
+
+          # Запись лицензии в файл
+          echo "${{ secrets.ONEC_LICENSE }}" | sudo tee /var/1C/licenses/licence.lic > /dev/null
+
+          # Назначение прав
+          sudo chmod 777 -R /var/1C/licenses
+        shell: bash
+        env:
+          ONEC_LICENSE: ${{ secrets.ONEC_LICENSE }}
+
+      - name: Установка лицензии (Windows)
+        if: startsWith(matrix.os, 'windows')
+        run: |
+            mkdir "C:\ProgramData\1C\licenses" -Force
+            echo $Env:ONEC_LICENSE | Out-File -FilePath "C:\ProgramData\1C\licenses\licence.lic" -Encoding ascii
+        shell: pwsh
+        env:
+            ONEC_LICENSE: ${{ secrets.ONEC_LICENSE }}
+
+      - name: Установка gitsync локально
+        run: opm run install-gitsync
+
+      - name: Тестирование
+        uses: coactions/setup-xvfb@v1
+        env:
+            EDT_VERSION: ${{ matrix.edt_version }}
+            GITSYNC_V8VERSION: ${{ matrix.v8_version }}
+        with:
+          run: oscript ./tasks/test.os
+
+      - name: Публикация отчета
+        if: success() || failure()
+        uses: mikepenz/action-junit-report@v5
+        with:
+          report_paths: '**/build/reports/*.xml'
+          fail_on_failure: true
+          comment: true
+          check_name: 'Результаты тестов. ОС: ${{ matrix.os }}. Версия 1С: ${{ matrix.v8_version }}. Версия OneScript: ${{ matrix.oscript_version }}. Версия EDT: ${{ matrix.edt_version }}'