Skip to content

Commit 30af044

Browse files
nixel2007nixel2007
committed
Merge branch 'develop'
2 parents d0837bd + fad8a9b commit 30af044

File tree

886 files changed

+15034
-3388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

886 files changed

+15034
-3388
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
## Описание
2-
<!--- Опишите внесеннные изменения -->
2+
<!--- ОБЯЗАТЕЛЬНО опишите внесенные изменения -->
33

44
## Связанные задачи
55
<!--- Для каждого PR обязательно наличие связанной задачи (issue). -->
6-
<!--- Необходимо указать ключи задач, предворяя их символом #, например -->
6+
<!--- Необходимо указать ключи задач, предваряя их символом #, например -->
77
<!---Closes #123 -->
88
<!-- -->
9-
<!-- ВНИМАНИЕ: Без ссылки на задачу запрос не будет принят! -->
9+
<!-- ВНИМАНИЕ: Без ссылки на задачу пулл-реквест не будет принят! -->
1010
<!-- -->
1111
Closes:
1212

‎.github/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "gradle" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "daily"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"

‎.github/workflows/benchmark.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ jobs:
2828
- name: Checkout project
2929
uses: actions/checkout@v2
3030

31-
- name: Setup JDK 15
32-
uses: actions/setup-java@v1
31+
- name: Setup JDK
32+
uses: actions/setup-java@v2
3333
with:
34-
java-version: 15
34+
java-version: 16
35+
distribution: 'adopt'
3536

3637
- name: Build with Gradle
3738
run: ./gradlew bootJar

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ jobs:
2828
if: ${{ github.event_name == 'pull_request' }}
2929

3030
- name: Set up JDK 11
31-
uses: actions/setup-java@v1
31+
uses: actions/setup-java@v2
3232
with:
3333
java-version: 11
34+
distribution: 'adopt'
3435

3536
# Initializes the CodeQL tools for scanning.
3637
- name: Initialize CodeQL

‎.github/workflows/gh-pages.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ jobs:
2020
- uses: actions/checkout@v1
2121

2222
- name: Setup JDK
23-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@v2
2424
with:
25-
java-version: 15
25+
java-version: 16
26+
distribution: 'adopt'
2627

2728
- name: Build javadoc
2829
run: ./gradlew --no-daemon javadoc
@@ -36,7 +37,7 @@ jobs:
3637
- name: Install dependencies
3738
run: |
3839
pip install --upgrade pip
39-
pip install mkdocs mkdocs-material==5.0.0 pygments-bsl
40+
pip install mkdocs mkdocs-material pygments-bsl
4041
4142
- name: Dowload latest GitHub Pages
4243
run: |
@@ -76,6 +77,8 @@ jobs:
7677
sed -i "s%BSL Language Server%BSL Language Server Dev%g" mkdocs.en.yml
7778
sed -i "s%https://1c-syntax.github.io/bsl-language-server%https://1c-syntax.github.io/bsl-language-server/dev%g" mkdocs.yml
7879
sed -i "s%https://1c-syntax.github.io/bsl-language-server%https://1c-syntax.github.io/bsl-language-server/dev%g" mkdocs.en.yml
80+
sed -i "s%link: /bsl-language-server/%link: /bsl-language-server/dev/%g" mkdocs.yml
81+
sed -i "s%link: /bsl-language-server/%link: /bsl-language-server/dev/%g" mkdocs.en.yml
7982
8083
- name: Build Russian
8184
run: |
@@ -137,8 +140,8 @@ jobs:
137140
cp -R temp/site/. public/dev/en
138141
139142
- name: Deploy
140-
uses: peaceiris/actions-gh-pages@v2.5.0
141-
env:
142-
ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
143-
PUBLISH_BRANCH: gh-pages
144-
PUBLISH_DIR: ./public
143+
uses: peaceiris/actions-gh-pages@v3.8.0
144+
with:
145+
deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
146+
publish_branch: gh-pages
147+
publish_dir: ./public

‎.github/workflows/gradle.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
java_version: ['11', '15']
11+
java_version: ['11', '16']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
1414
- uses: actions/checkout@v1
1515
- name: Set up JDK ${{ matrix.java_version }}
16-
uses: actions/setup-java@v1
16+
uses: actions/setup-java@v2
1717
with:
1818
java-version: ${{ matrix.java_version }}
19+
distribution: 'adopt'
1920
- name: Build with Gradle
2021
run: ./gradlew check --stacktrace
2122
- name: Archive test results
2223
if: failure()
23-
uses: actions/upload-artifact@v1
24+
uses: actions/upload-artifact@v2.2.3
2425
with:
2526
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
2627
path: build/reports/tests/test

‎.github/workflows/javadoc.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: javadoc
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v1
10+
- name: Set up JDK
11+
uses: actions/setup-java@v2
12+
with:
13+
java-version: 16
14+
distribution: 'adopt'
15+
- name: Check javadoc build
16+
run: ./gradlew javadoc --stacktrace

‎.github/workflows/qa.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
- run: |
1919
git fetch --prune --unshallow
2020
- name: Set up JDK 11
21-
uses: actions/setup-java@v1
21+
uses: actions/setup-java@v2
2222
with:
2323
java-version: 11
24+
distribution: 'adopt'
2425
- name: SonarCloud Scan
2526
run: ./gradlew check sonarqube
2627
env:

‎.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ jobs:
3030
- name: Checkout source
3131
uses: actions/checkout@v2
3232
- name: Set up JDK
33-
uses: actions/setup-java@v1
33+
uses: actions/setup-java@v2
3434
with:
35-
java-version: 15
35+
java-version: 16
36+
distribution: 'adopt'
3637
- name: Build bootJar with Gradle
3738
run: ./gradlew check bootJar
3839
- name: Build jpackage app-image
@@ -89,7 +90,7 @@ jobs:
8990
start()
9091
shell: python
9192
- name: Upload artifact
92-
uses: actions/upload-artifact@master
93+
uses: actions/upload-artifact@v2.2.3
9394
with:
9495
name: bsl-language-server_${{ matrix.prefix }}.zip
9596
path: ./${{ matrix.app-image }}

‎.idea/compiler.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)