Skip to content

Commit 3c21d18

Browse files
committed
Merge branch 'develop'
2 parents adad907 + 4018fc5 commit 3c21d18

File tree

1,054 files changed

+13171
-3063
lines changed

Some content is hidden

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

1,054 files changed

+13171
-3063
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
*.md eol=lf
55
*.json eol=lf
66
*.bat eol=crlf
7+
src/test/resources/context/DocumentContextBrokenLineFeeds.bsl binary

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- -->
99
<!-- ВНИМАНИЕ: Без ссылки на задачу пулл-реквест не будет принят! -->
1010
<!-- -->
11-
Closes:
11+
Closes
1212

1313
## Чеклист
1414
<!--- Перед отправкой пройдите по списку и поставьте отметку для каждого выполненного действия -->
@@ -23,7 +23,7 @@ Closes:
2323

2424
### Для диагностик
2525

26-
- [ ] Описание диагностики заполнено для обоих языков (перевод на английский не обязателен)
26+
- [ ] Описание диагностики заполнено для обоих языков (присутствуют файлы для обоих языков, для русского заполнено все подробно, перевод на английский можно опустить)
2727

2828
## Дополнительно
2929
<!--- Различная дополнительная информация, скриншоты и т.д. -->

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: ./gradlew check --stacktrace
2222
- name: Archive test results
2323
if: failure()
24-
uses: actions/upload-artifact@v2.2.3
24+
uses: actions/upload-artifact@v2.2.4
2525
with:
2626
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
2727
path: build/reports/tests/test
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Publish to Sonatype
2+
3+
on:
4+
release:
5+
types: [published]
6+
push:
7+
branches:
8+
- develop
9+
workflow_dispatch:
10+
11+
jobs:
12+
publish:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2.3.4
16+
- name: Set up JDK
17+
uses: actions/setup-java@v2
18+
with:
19+
java-version: 16
20+
distribution: 'adopt'
21+
- name: Publish to Sonatype
22+
run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion
23+
env:
24+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
26+
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
27+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SIGNING_KEY }}
28+
ORG_GRADLE_PROJECT_signingInMemoryPassword: ${{ secrets.GPG_SIGNING_PASSWORD }}
29+
- name: Close repository
30+
if: github.event_name == 'release'
31+
run: ./gradlew closeAndReleaseRepository
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
35+
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
36+
ORG_GRADLE_PROJECT_nexusUsername: ${{ secrets.SONATYPE_USERNAME }}
37+
ORG_GRADLE_PROJECT_nexusPassword: ${{ secrets.SONATYPE_PASSWORD }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
start()
9191
shell: python
9292
- name: Upload artifact
93-
uses: actions/upload-artifact@v2.2.3
93+
uses: actions/upload-artifact@v2.2.4
9494
with:
9595
name: bsl-language-server_${{ matrix.prefix }}.zip
9696
path: ./${{ matrix.app-image }}

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,14 @@
2828
# When using Gradle or Maven with auto-import, you should exclude module files,
2929
# since they will be recreated, and may cause churn. Uncomment if using
3030
# auto-import.
31+
.idea/artifacts
32+
.idea/compiler.xml
33+
.idea/jarRepositories.xml
3134
.idea/modules.xml
3235
.idea/*.iml
3336
.idea/modules
37+
*.iml
38+
*.ipr
3439

3540
# IntelliJ
3641
out/
@@ -72,3 +77,4 @@ public/
7277
# jpackage
7378
bsl-language-server/
7479
bsl-language-server_*.zip
80+
/.idea/misc.xml

.idea/codeStyles/Project.xml

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

.idea/compiler.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.idea/inspectionProfiles/Project_Default.xml

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

.idea/jarRepositories.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)