Skip to content

Commit 5c6d2b2

Browse files
committed
Merge branch 'release/1.11.0'
2 parents 0add065 + 7da06ce commit 5c6d2b2

Some content is hidden

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

66 files changed

+8954
-1777
lines changed

.github/dependabot.yml

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

.github/workflows/gradle.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Java CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ${{ matrix.os }}
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
java_version: ['11', '17']
12+
os: [ubuntu-latest, windows-latest, macOS-latest]
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set up JDK ${{ matrix.java_version }}
16+
uses: actions/setup-java@v3.3.0
17+
with:
18+
java-version: ${{ matrix.java_version }}
19+
distribution: 'adopt'
20+
- name: Build with Gradle
21+
run: ./gradlew check --stacktrace
22+
- name: Archive test results
23+
if: failure()
24+
uses: actions/upload-artifact@v3
25+
with:
26+
name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
27+
path: build/reports/tests/test

.github/workflows/night_build.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Night build
2+
on:
3+
schedule:
4+
- cron: '0 6 * * *' # run at 6 AM UTC
5+
push:
6+
branches:
7+
- nigth_build
8+
workflow_dispatch:
9+
10+
jobs:
11+
nightly:
12+
name: Night build
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout source
16+
uses: actions/checkout@v3
17+
with:
18+
ref: nigth_build
19+
- name: Set up JDK
20+
uses: actions/setup-java@v3.3.0
21+
with:
22+
java-version: 11
23+
distribution: 'adopt'
24+
- name: Build with Gradle
25+
run: ./gradlew build
26+
- name: Save file name
27+
run: echo "PLUGIN_FILE_NAME=$(ls -t ./build/libs | head -1)" >> $GITHUB_ENV
28+
- name: Save current date
29+
run: echo "PLUGIN_CURRENT_DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
30+
- name: Deploy build
31+
uses: WebFreak001/deploy-nightly@v1.1.0
32+
env:
33+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
with:
35+
upload_url: https://uploads.github.com/repos/1c-syntax/sonar-bsl-plugin-community/releases/51033599/assets{?name,label} # find out this value by opening https://api.github.com/repos/<owner>/<repo>/releases in your browser and copy the full "upload_url" value including the {?name,label} part
36+
release_id: 51033599 # same as above (id can just be taken out the upload_url, it's used to find old releases)
37+
asset_path: ./build/libs/${{ env.PLUGIN_FILE_NAME }} # path to archive to upload
38+
asset_name: sonar-communitybsl-plugin-nightly-${{ env.PLUGIN_CURRENT_DATE }}.jar # name, format is "-nightly-20210101"
39+
asset_content_type: application/java-archive # required by GitHub API
40+
max_releases: 7 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

.github/workflows/qa.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: QA
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request:
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
fetch-depth: ''
17+
- run: |
18+
git fetch --prune --unshallow
19+
- name: Set up JDK 11
20+
uses: actions/setup-java@v3.3.0
21+
with:
22+
java-version: 11
23+
distribution: 'adopt'
24+
- name: SonarCloud Scan
25+
run: ./gradlew check sonarqube
26+
env:
27+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Upload to release
2+
3+
on:
4+
release:
5+
types: [published, edited]
6+
7+
jobs:
8+
build:
9+
10+
runs-on: ubuntu-latest
11+
name: Upload to release
12+
13+
steps:
14+
- name: Checkout source
15+
uses: actions/checkout@v3
16+
- name: Set up JDK
17+
uses: actions/setup-java@v3.3.0
18+
with:
19+
java-version: 11
20+
distribution: 'adopt'
21+
- name: Build with Gradle
22+
run: ./gradlew build
23+
- name: Upload jar to release
24+
uses: AButler/upload-release-assets@v2.0
25+
with:
26+
files: './build/libs/*.jar'
27+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,12 @@ build/
5858
intellij-bsl/src/test/resources/parser/.idea/
5959

6060
gen/
61-
out/
6261

6362
# Crashlytics plugin (for Android Studio and IntelliJ)
64-
com_crashlytics_export_strings.xml
65-
crashlytics.properties
66-
crashlytics-build.properties
67-
fabric.properties
6863

6964
\.idea/sonarlint-state\.xml
7065

7166
\.idea/sonarlint\.xml
67+
/.idea/jarRepositories.xml
68+
/.idea/vcs.xml
69+
/.idea/compiler.xml

.idea/compiler.xml

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

.idea/misc.xml

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

COPYING.LESSER.md

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

0 commit comments

Comments
 (0)