-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into tinylog
* upstream/main: (259 commits) Fix exception on preview style edit and selection (#8293) Fix icon picker excpetion in groups dialog (#8290) Add doc tests (#8242) fix merge conflict Squashed 'buildres/csl/csl-locales/' changes from 0cc3885f61..d5ee85de8e Squashed 'buildres/csl/csl-styles/' changes from 3a6a0a7..3bb4b5f Consider directory pattern when checking if a file can be moved (#8244) Bump byte-buddy-parent from 1.12.1 to 1.12.2 (#8285) Bump unirest-java from 3.13.3 to 3.13.4 (#8283) Bump checkstyle from 9.1 to 9.2 (#8284) Bump classgraph from 4.8.135 to 4.8.137 (#8282) Do not resize main table columns in search dialog window (#8253) Fix NegativeArraySizeException (#8270) Update deployment.yml TEst Grand unified library properties (GRULPS) (#8264) Fixes RFC fetcher test case (#8271) Update Gradle Wrapper from 7.2 to 7.3 (#8246) Observable Preferences H (WorkingDir, getUser, NameFormatter, Version, SpecialFields) (#8260) Bump checkstyle from 9.0.1 to 9.1 (#8266) ...
- Loading branch information
Showing
478 changed files
with
24,446 additions
and
6,323 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,6 +26,11 @@ env: | |
GRADLE_OPTS: -Xmx4g -Dorg.gradle.daemon=false -Dorg.gradle.vfs.watch=false | ||
JAVA_OPTS: -Xmx4g | ||
|
||
concurrency: | ||
group: ${{ github.ref }} | ||
cancel-in-progress: true | ||
|
||
|
||
jobs: | ||
build: | ||
strategy: | ||
|
@@ -45,21 +50,17 @@ jobs: | |
runs-on: ${{ matrix.os }} | ||
name: Create installer and portable version for ${{ matrix.displayName }} | ||
steps: | ||
- name: Cancel Previous Runs | ||
uses: styfle/[email protected] | ||
with: | ||
access_token: ${{ github.token }} | ||
- name: Fetch all history for all tags and branches | ||
uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
- name: Install GitVersion | ||
uses: gittools/actions/gitversion/[email protected].10 | ||
uses: gittools/actions/gitversion/[email protected].11 | ||
with: | ||
versionSpec: "5.x" | ||
- name: Run GitVersion | ||
id: gitversion | ||
uses: gittools/actions/gitversion/[email protected].10 | ||
uses: gittools/actions/gitversion/[email protected].11 | ||
- name: Set up JDK | ||
uses: actions/setup-java@v2 | ||
with: | ||
|
@@ -155,12 +156,12 @@ jobs: | |
- name: Fetch all history for all tags and branches | ||
run: git fetch --prune --unshallow | ||
- name: Install GitVersion | ||
uses: gittools/actions/gitversion/[email protected].10 | ||
uses: gittools/actions/gitversion/[email protected].11 | ||
with: | ||
versionSpec: '5.x' | ||
- name: Run GitVersion | ||
id: gitversion | ||
uses: gittools/actions/gitversion/[email protected].10 | ||
uses: gittools/actions/gitversion/[email protected].11 | ||
- name: Get linux binaries | ||
uses: actions/download-artifact@master | ||
with: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ on: | |
- gource | ||
schedule: | ||
- cron: '15 3 1 1,4,7,10 *' | ||
workflow_dispatch: | ||
|
||
jobs: | ||
action: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,9 +3,11 @@ name: Tests | |
on: | ||
push: | ||
branches: | ||
- master | ||
- main | ||
- main-release | ||
pull_request: | ||
# always run on pull requests | ||
workflow_dispatch: | ||
|
||
env: | ||
SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }} | ||
|
@@ -14,15 +16,15 @@ env: | |
GRADLE_OPTS: -Xmx4g | ||
JAVA_OPTS: -Xmx4g | ||
|
||
concurrency: | ||
group: tests-${{ github.head_ref }} | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
checkstyle: | ||
name: Checkstyle | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Cancel Previous Runs | ||
uses: styfle/[email protected] | ||
with: | ||
access_token: ${{ github.token }} | ||
- name: Checkout source | ||
uses: actions/checkout@v2 | ||
- name: Set up JDK | ||
|
@@ -41,7 +43,7 @@ jobs: | |
- name: Run markdown-lint | ||
uses: avto-dev/markdown-lint@v1 | ||
with: | ||
args: CHANGELOG.md CONTRIBUTING.md README.md docs/ | ||
args: CHANGELOG.md CONTRIBUTING.md README.md | ||
config: '.markdownlint.yml' | ||
tests: | ||
name: Unit tests | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,8 @@ | ||
default: true | ||
|
||
# Using h2 has side effects in GitBook's toc. Thus, we sometimes switch from h1 to h3 | ||
MD001: false | ||
|
||
MD012: | ||
# 2 are required, because GitBook adss two blank lines at the end of a file | ||
maximum: 2 | ||
|
||
# allow arbitrary line length | ||
MD013: false | ||
|
||
# The FAQs state questions - we allow them | ||
MD026: | ||
punctuation: ".,;:!" | ||
|
||
# not supported by gitbook | ||
MD031: false | ||
|
||
MD033: | ||
# we have <a> tags with ids and superscript | ||
allowed_elements: ['a', 'kbd', 'sup'] | ||
|
||
# seems to be unsupported by gitbook anymore | ||
MD045: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.