-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'origin_master' into verovio-neu-measure-navigation
# Conflicts: # Resources/Private/Partials/KitodoPageView.html # Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html # Resources/Public/Css/Digitalcollections.css
- Loading branch information
Showing
24 changed files
with
843 additions
and
618 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
parameters: | ||
ignoreErrors: | ||
- '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findByIsListed\(\)\.#' | ||
- '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findByIsSortable\(\)\.#' | ||
level: 5 | ||
paths: | ||
- ../Classes/ | ||
treatPhpDocTypesAsCertain: 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
name: GruntComparison | ||
|
||
on: | ||
push: | ||
branches: [ "master" ] | ||
pull_request: | ||
branches: [ "master" ] | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
|
||
strategy: | ||
matrix: | ||
node-version: [12.x] | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
|
||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: npm | ||
cache-dependency-path: './Build/package-lock.json' | ||
|
||
- name: Install and run Grunt | ||
working-directory: ./Build | ||
run: | | ||
npm install -g grunt-cli | ||
npm audit fix | ||
echo "Running `grunt less`" | ||
grunt less | ||
echo "Running `grunt terser`" | ||
grunt terser | ||
- name: Test for changes | ||
working-directory: ./ | ||
run: | | ||
git diff -- ./Resources/Public/ | ||
if [ -n "$(git status --porcelain -- ./Resources/Public/)" ]; then | ||
echo "Changes detected in compiled files" | ||
exit 1 | ||
else | ||
echo "No changes detected in compiled files" | ||
fi |
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 |
---|---|---|
@@ -0,0 +1,25 @@ | ||
name: PHPStan | ||
|
||
on: | ||
push: | ||
branches: [ "master" ] | ||
pull_request: | ||
branches: [ "master" ] | ||
|
||
jobs: | ||
phpstan: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v3 | ||
|
||
- name: Install dependencies | ||
uses: php-actions/composer@v6 | ||
with: | ||
command: update | ||
php_version: "7.4" | ||
|
||
- name: PHPStan Static Analysis | ||
uses: php-actions/phpstan@v3 | ||
with: | ||
configuration: ./.github/phpstan.neon |
Oops, something went wrong.