Skip to content

Commit 03560bd

Browse files
nixel2007nixel2007
committed
Merge branch 'develop'
2 parents 07d896a + df59ac8 commit 03560bd

File tree

1,282 files changed

+16189
-9985
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,282 files changed

+16189
-9985
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
runs-on: self-hosted
2727
steps:
2828
- name: Checkout project
29-
uses: actions/checkout@v2.3.4
29+
uses: actions/checkout@v3
3030

3131
- name: Setup JDK
32-
uses: actions/setup-java@v2
32+
uses: actions/setup-java@v3
3333
with:
34-
java-version: 16
35-
distribution: 'adopt'
34+
java-version: 17
35+
distribution: 'temurin'
3636

3737
- name: Build with Gradle
3838
run: ./gradlew bootJar
3939

4040
- name: Set up Python
41-
uses: actions/setup-python@v2.2.2
41+
uses: actions/setup-python@v3
4242
with:
4343
python-version: "3.7"
4444

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,34 @@ on:
1010
- cron: '0 0 * * 5'
1111

1212
jobs:
13+
gatekeeper:
14+
runs-on: ubuntu-latest
15+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
16+
steps:
17+
- run: echo 'Open the Golden Gate'
18+
1319
analyse:
20+
needs: gatekeeper
1421
name: Analyse
1522
runs-on: ubuntu-latest
1623

1724
steps:
1825
- name: Checkout repository
19-
uses: actions/checkout@v2.3.4
26+
uses: actions/checkout@v3
2027
with:
2128
# We must fetch at least the immediate parents so that if this is
2229
# a pull request then we can checkout the head.
2330
fetch-depth: 2
2431

2532
- name: Set up JDK 11
26-
uses: actions/setup-java@v2
33+
uses: actions/setup-java@v3
2734
with:
28-
java-version: 11
29-
distribution: 'adopt'
35+
java-version: 17
36+
distribution: 'temurin'
3037

3138
# Initializes the CodeQL tools for scanning.
3239
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@v1
40+
uses: github/codeql-action/init@v2
3441
# Override language selection by uncommenting this and choosing your languages
3542
with:
3643
languages: java
@@ -45,4 +52,4 @@ jobs:
4552
- run: ./gradlew jar
4653

4754
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@v1
55+
uses: github/codeql-action/analyze@v2

‎.github/workflows/gh-pages.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ jobs:
1717
build-deploy:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v2.3.4
20+
- uses: actions/checkout@v3
2121

2222
- name: Setup JDK
23-
uses: actions/setup-java@v2
23+
uses: actions/setup-java@v3
2424
with:
25-
java-version: 16
26-
distribution: 'adopt'
25+
java-version: 17
26+
distribution: 'temurin'
2727

2828
- name: Build javadoc
2929
run: ./gradlew --no-daemon javadoc
3030

3131
- name: Set up Python
32-
uses: actions/setup-python@v2.2.2
32+
uses: actions/setup-python@v3
3333
with:
3434
python-version: '3.6'
3535
architecture: 'x64'
@@ -79,7 +79,12 @@ jobs:
7979
sed -i "s%https://1c-syntax.github.io/bsl-language-server%https://1c-syntax.github.io/bsl-language-server/dev%g" mkdocs.en.yml
8080
sed -i "s%link: /bsl-language-server/%link: /bsl-language-server/dev/%g" mkdocs.yml
8181
sed -i "s%link: /bsl-language-server/%link: /bsl-language-server/dev/%g" mkdocs.en.yml
82-
82+
83+
- name: Build documentation
84+
run: |
85+
./gradlew generateDiagnosticDocs --build
86+
./gradlew generateDiagnosticsIndex --build
87+
8388
- name: Build Russian
8489
run: |
8590
mkdir temp

‎.github/workflows/gradle.yml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
11
name: Java CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches-ignore:
6+
- "translations_*"
7+
pull_request:
48

59
jobs:
10+
gatekeeper:
11+
runs-on: ubuntu-latest
12+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
13+
steps:
14+
- run: echo 'Open the Golden Gate'
615
build:
16+
needs: gatekeeper
717
runs-on: ${{ matrix.os }}
818
strategy:
919
fail-fast: false
1020
matrix:
11-
java_version: ['11', '16']
21+
java_version: ['11', '17']
1222
os: [ubuntu-latest, windows-latest, macOS-latest]
1323
steps:
14-
- uses: actions/checkout@v2.3.4
24+
- uses: actions/checkout@v3
1525
- name: Set up JDK ${{ matrix.java_version }}
16-
uses: actions/setup-java@v2
26+
uses: actions/setup-java@v3
1727
with:
1828
java-version: ${{ matrix.java_version }}
19-
distribution: 'adopt'
29+
distribution: 'temurin'
2030
- name: Build with Gradle
2131
run: ./gradlew check --stacktrace
2232
- name: Archive test results
2333
if: failure()
24-
uses: actions/upload-artifact@v2.2.4
34+
uses: actions/upload-artifact@v3
2535
with:
2636
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
2737
path: build/reports/tests/test

‎.github/workflows/javadoc.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
name: javadoc
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches-ignore:
6+
- "translations_*"
7+
pull_request:
48

59
jobs:
10+
gatekeeper:
11+
runs-on: ubuntu-latest
12+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
13+
steps:
14+
- run: echo 'Open the Golden Gate'
15+
616
build:
17+
needs: gatekeeper
718
runs-on: ubuntu-latest
819
steps:
9-
- uses: actions/checkout@v2.3.4
20+
- uses: actions/checkout@v3
1021
- name: Set up JDK
11-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
1223
with:
13-
java-version: 16
14-
distribution: 'adopt'
24+
java-version: 17
25+
distribution: 'temurin'
1526
- name: Check javadoc build
1627
run: ./gradlew javadoc --stacktrace

‎.github/workflows/pre-qa.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Pre-QA
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- "translations_*"
7+
pull_request:
8+
9+
jobs:
10+
gatekeeper:
11+
runs-on: ubuntu-latest
12+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
13+
steps:
14+
- run: echo 'Open the Golden Gate'
15+
build:
16+
needs: gatekeeper
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Save PR number to file
20+
if: github.event_name == 'pull_request'
21+
run: echo ${{ github.event.number }} > PR_NUMBER.txt
22+
- name: Archive PR number
23+
if: github.event_name == 'pull_request'
24+
uses: actions/upload-artifact@v3
25+
with:
26+
name: PR_NUMBER
27+
path: PR_NUMBER.txt

‎.github/workflows/publish-to-sonatype.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
publish:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2.3.4
15+
- uses: actions/checkout@v3
1616
- name: Set up JDK
17-
uses: actions/setup-java@v2
17+
uses: actions/setup-java@v3
1818
with:
19-
java-version: 16
20-
distribution: 'adopt'
19+
java-version: 17
20+
distribution: 'temurin'
2121
- name: Publish to Sonatype
2222
run: ./gradlew publishMavenPublicationToSonatypeRepository -PsimplifyVersion
2323
env:

‎.github/workflows/qa.yml‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,66 @@
11
name: QA
22

33
on:
4-
push:
5-
branches:
6-
- develop
7-
- master
8-
pull_request:
4+
workflow_run:
5+
workflows: [Pre-QA]
6+
types: [completed]
97

108
jobs:
9+
1110
QA:
1211
runs-on: ubuntu-latest
13-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
12+
if: github.event.workflow_run.conclusion == 'success'
1413
steps:
15-
- uses: actions/[email protected]
14+
- name: Download PR number artifact
15+
if: github.event.workflow_run.event == 'pull_request'
16+
uses: dawidd6/action-download-artifact@v2
17+
with:
18+
workflow: ${{ github.event.workflow_run.name }}
19+
run_id: ${{ github.event.workflow_run.id }}
20+
name: PR_NUMBER
21+
- name: Read PR_NUMBER.txt
22+
if: github.event.workflow_run.event == 'pull_request'
23+
id: pr_number
24+
uses: juliangruber/read-file-action@v1
25+
with:
26+
path: ./PR_NUMBER.txt
27+
- name: Request GitHub API for PR data
28+
if: github.event.workflow_run.event == 'pull_request'
29+
uses: octokit/[email protected]
30+
id: get_pr_data
1631
with:
17-
fetch-depth: ''
18-
- run: |
19-
git fetch --prune --unshallow
32+
route: GET /repos/{full_name}/pulls/{number}
33+
number: ${{ steps.pr_number.outputs.content }}
34+
full_name: ${{ github.event.repository.full_name }}
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
- uses: actions/checkout@v3
38+
with:
39+
repository: ${{ github.event.workflow_run.head_repository.full_name }}
40+
ref: ${{ github.event.workflow_run.head_branch }}
41+
fetch-depth: 0
42+
- name: Checkout base branch
43+
if: github.event.workflow_run.event == 'pull_request'
44+
run: |
45+
git remote add upstream ${{ github.event.repository.clone_url }}
46+
git fetch upstream
47+
git checkout -B ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} upstream/${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
48+
git checkout ${{ github.event.workflow_run.head_branch }}
49+
git clean -ffdx && git reset --hard HEAD
2050
- name: Set up JDK 11
21-
uses: actions/setup-java@v2
51+
uses: actions/setup-java@v3
2252
with:
2353
java-version: 11
24-
distribution: 'adopt'
25-
- name: SonarCloud Scan
26-
run: ./gradlew check sonarqube
54+
distribution: 'temurin'
55+
- name: SonarCloud Scan on PR
56+
if: github.event.workflow_run.event == 'pull_request'
57+
run: ./gradlew check sonarqube -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} -Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
58+
env:
59+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
- name: SonarCloud Scan on push
62+
if: github.event.workflow_run.event == 'push' && github.event.workflow_run.head_repository.full_name == github.event.repository.full_name
63+
run: ./gradlew check sonarqube -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }}
2764
env:
2865
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
2966
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/qodana.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Qodana
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches:
7+
- develop
8+
- feature/qodana
9+
10+
jobs:
11+
gatekeeper:
12+
runs-on: ubuntu-latest
13+
if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
14+
steps:
15+
- run: echo 'Open the Golden Gate'
16+
17+
qodana:
18+
needs: gatekeeper
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: 'Qodana Scan'
23+
uses: JetBrains/[email protected]
24+
with:
25+
linter: jetbrains/qodana-jvm-community
26+
- uses: github/codeql-action/upload-sarif@v2
27+
with:
28+
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
29+
- name: Deploy to GitHub Pages
30+
if: github.event_name == 'push'
31+
uses: peaceiris/actions-gh-pages@v3
32+
with:
33+
github_token: ${{ secrets.GITHUB_TOKEN }}
34+
publish_dir: ${{ runner.temp }}/qodana/results/report
35+
destination_dir: ./qodana

‎.github/workflows/rebase.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Automatic Rebase
2+
on:
3+
issue_comment:
4+
types: [created]
5+
jobs:
6+
rebase:
7+
name: Rebase
8+
if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase')
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout the latest code
12+
uses: actions/checkout@v3
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
16+
- name: Automatic Rebase
17+
uses: cirrus-actions/[email protected]
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)