Merge branch 'develop'

Author: nixel2007

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,12 @@
 ## Описание
-<!--- Опишите внесеннные изменения -->
+<!--- ОБЯЗАТЕЛЬНО опишите внесенные изменения -->
 
 ## Связанные задачи
 <!--- Для каждого PR обязательно наличие связанной задачи (issue). -->
-<!--- Необходимо указать ключи задач, предворяя их символом #, например -->
+<!--- Необходимо указать ключи задач, предваряя их символом #, например -->
 <!---Closes #123 -->
 <!-- -->
-<!-- ВНИМАНИЕ: Без ссылки на задачу запрос не будет принят! -->
+<!-- ВНИМАНИЕ: Без ссылки на задачу пулл-реквест не будет принят! -->
 <!-- -->
 Closes:
 

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "gradle" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "daily"
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"

.github/workflows/benchmark.yml

@@ -28,10 +28,11 @@ jobs:
  - name: Checkout project
  uses: actions/checkout@v2
 
- - name: Setup JDK 15
- uses: actions/setup-java@v1
+ - name: Setup JDK
+ uses: actions/setup-java@v2
  with:
- java-version: 15
+ java-version: 16
+ distribution: 'adopt'
 
  - name: Build with Gradle
  run: ./gradlew bootJar

.github/workflows/codeql-analysis.yml

@@ -28,9 +28,10 @@ jobs:
  if: ${{ github.event_name == 'pull_request' }}
 
  - name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
  with:
  java-version: 11
+ distribution: 'adopt'
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL

.github/workflows/gh-pages.yml

@@ -20,9 +20,10 @@ jobs:
  - uses: actions/checkout@v1
 
  - name: Setup JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
  with:
- java-version: 15
+ java-version: 16
+ distribution: 'adopt'
 
  - name: Build javadoc
  run: ./gradlew --no-daemon javadoc
@@ -36,7 +37,7 @@ jobs:
  - name: Install dependencies
  run: |
  pip install --upgrade pip
- pip install mkdocs mkdocs-material==5.0.0 pygments-bsl
+ pip install mkdocs mkdocs-material pygments-bsl
  
  - name: Dowload latest GitHub Pages
  run: |
@@ -76,6 +77,8 @@ jobs:
  sed -i "s%BSL Language Server%BSL Language Server Dev%g" mkdocs.en.yml
  sed -i "s%https://1c-syntax.github.io/bsl-language-server%https://1c-syntax.github.io/bsl-language-server/dev%g" mkdocs.yml
  sed -i "s%https://1c-syntax.github.io/bsl-language-server%https://1c-syntax.github.io/bsl-language-server/dev%g" mkdocs.en.yml
+ sed -i "s%link: /bsl-language-server/%link: /bsl-language-server/dev/%g" mkdocs.yml
+ sed -i "s%link: /bsl-language-server/%link: /bsl-language-server/dev/%g" mkdocs.en.yml
  
  - name: Build Russian
  run: |
@@ -137,8 +140,8 @@ jobs:
  cp -R temp/site/. public/dev/en
  
  - name: Deploy
- uses: peaceiris/actions-gh-pages@v2.5.0
- env:
- ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
- PUBLISH_BRANCH: gh-pages
- PUBLISH_DIR: ./public
+ uses: peaceiris/actions-gh-pages@v3.8.0
+ with:
+ deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+ publish_branch: gh-pages
+ publish_dir: ./public

.github/workflows/gradle.yml

@@ -8,19 +8,20 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- java_version: ['11', '15']
+ java_version: ['11', '16']
  os: [ubuntu-latest, windows-latest, macOS-latest]
  steps:
  - uses: actions/checkout@v1
  - name: Set up JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
  with:
  java-version: ${{ matrix.java_version }}
+ distribution: 'adopt'
  - name: Build with Gradle
  run: ./gradlew check --stacktrace
  - name: Archive test results
  if: failure()
- uses: actions/upload-artifact@v1
+ uses: actions/upload-artifact@v2.2.3
  with:
  name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
  path: build/reports/tests/test

.github/workflows/javadoc.yml

@@ -0,0 +1,16 @@
+name: javadoc
+
+on: [push, pull_request]
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v1
+ - name: Set up JDK
+ uses: actions/setup-java@v2
+ with:
+ java-version: 16
+ distribution: 'adopt'
+ - name: Check javadoc build
+ run: ./gradlew javadoc --stacktrace

.github/workflows/qa.yml

@@ -18,9 +18,10 @@ jobs:
  - run: |
  git fetch --prune --unshallow
  - name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
  with:
  java-version: 11
+ distribution: 'adopt'
  - name: SonarCloud Scan
  run: ./gradlew check sonarqube
  env:

.github/workflows/release.yml

@@ -30,9 +30,10 @@ jobs:
  - name: Checkout source
  uses: actions/checkout@v2 
  - name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
  with:
- java-version: 15
+ java-version: 16
+ distribution: 'adopt'
  - name: Build bootJar with Gradle
  run: ./gradlew check bootJar
  - name: Build jpackage app-image
@@ -89,7 +90,7 @@ jobs:
  start()
  shell: python
  - name: Upload artifact
- uses: actions/upload-artifact@master
+ uses: actions/upload-artifact@v2.2.3
  with:
  name: bsl-language-server_${{ matrix.prefix }}.zip
  path: ./${{ matrix.app-image }}