Skip to content

Commit

Permalink
Merge branch 'origin_master' into verovio-neu-measure-navigation
Browse files Browse the repository at this point in the history
# Conflicts:
#	Resources/Private/Partials/KitodoPageView.html
#	Resources/Private/Plugins/Kitodo/Templates/Toolbox/Main.html
#	Resources/Public/Css/Digitalcollections.css
  • Loading branch information
chrizzor committed Jun 18, 2024
2 parents 6afdc60 + adee936 commit 3223512
Show file tree
Hide file tree
Showing 24 changed files with 843 additions and 618 deletions.
8 changes: 8 additions & 0 deletions .github/phpstan.neon
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
47 changes: 47 additions & 0 deletions .github/workflows/npm-grunt.yml
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
25 changes: 25 additions & 0 deletions .github/workflows/phpstan.yml
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
Loading

0 comments on commit 3223512

Please sign in to comment.