Skip to content

Commit

Permalink
Merge branch 'slub_master' into Full-text-features-main
Browse files Browse the repository at this point in the history
# Conflicts:
#	Build/package-lock.json
#	Classes/Controller/UriController.php
#	Resources/Private/JavaScript/dfgviewerScripts.js
#	Resources/Private/Less/all.less
#	Resources/Private/Less/components/audioplayer.less
#	Resources/Private/Less/components/controls.less
#	Resources/Private/Less/modules/home.less
#	Resources/Private/Partials/ControlBar.html
#	Resources/Private/Partials/PageView.html
#	Resources/Public/Css/allStyles.css
#	Resources/Public/Css/webStyles.css
#	Resources/Public/JavaScript/allScripts.js
#	Resources/Public/JavaScript/webScripts.js
  • Loading branch information
chrizzor committed Jun 18, 2024
2 parents 18c2c29 + faf392a commit b222013
Show file tree
Hide file tree
Showing 65 changed files with 2,556 additions and 1,008 deletions.
12 changes: 12 additions & 0 deletions .github/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: "CodeQL Configuration"

queries:
- uses: security-and-quality

query-filters:
- exclude:
problem.severity:
- note

paths-ignore:
- Resources/Public/JavaScript
5 changes: 5 additions & 0 deletions .github/phpstan.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
parameters:
level: 5
paths:
- ../Classes/
treatPhpDocTypesAsCertain: false
39 changes: 39 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ javascript ]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql.yml

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
17 changes: 17 additions & 0 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: test documentation

on: [ push, pull_request ]

jobs:
tests:
name: documentation
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Test if the documentation will render without warnings
run: |
mkdir -p Documentation-GENERATED-temp \
&& docker run --rm --pull always -v $(pwd):/project \
ghcr.io/typo3-documentation/render-guides:latest --config=Documentation --no-progress --fail-on-log
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
24 changes: 0 additions & 24 deletions ABOUT.txt

This file was deleted.

2 changes: 0 additions & 2 deletions Build/Documentation/.gitignore

This file was deleted.

35 changes: 0 additions & 35 deletions Build/Documentation/conf.py

This file was deleted.

7 changes: 0 additions & 7 deletions Build/Documentation/docker-compose.t3docs.yml

This file was deleted.

55 changes: 0 additions & 55 deletions Build/Documentation/sphinx.sh

This file was deleted.

Loading

0 comments on commit b222013

Please sign in to comment.