From 4653262c649a93ea83b8f8c0f63333110bbdf2da Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Wed, 29 May 2024 09:35:11 +0200 Subject: [PATCH] [MAINTENANCE] Update GitHub workflows (#1217) --- .../task-for-the-development-fund.md | 2 +- .github/codeql.yml | 26 ++++---- .github/phpstan.neon | 60 +++++++++---------- .github/pull.yml | 3 + .github/workflows/codeql.yml | 6 +- .github/workflows/documentation.yml | 4 +- .github/workflows/phpstan.yml | 1 + .github/workflows/tests.yml | 1 + 8 files changed, 54 insertions(+), 49 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/task-for-the-development-fund.md b/.github/ISSUE_TEMPLATE/task-for-the-development-fund.md index f67eef870..d798baeac 100644 --- a/.github/ISSUE_TEMPLATE/task-for-the-development-fund.md +++ b/.github/ISSUE_TEMPLATE/task-for-the-development-fund.md @@ -2,7 +2,7 @@ name: Task for the development fund about: A working package which may be sponsored by the Kitodo e.V. development fund. title: "[FUND] " -labels: ⭐ development fund 2024 +labels: ⭐ development fund 2025 assignees: '' --- diff --git a/.github/codeql.yml b/.github/codeql.yml index 56085d7bf..4e2fa3a6d 100644 --- a/.github/codeql.yml +++ b/.github/codeql.yml @@ -1,16 +1,16 @@ - name: "CodeQL Configuration" +name: CodeQL Configuration - queries: - - uses: security-and-quality +queries: + - uses: security-and-quality - query-filters: - - exclude: - problem.severity: - - note +query-filters: + - exclude: + problem.severity: + - note - paths-ignore: - - Resources/Public/JavaScript/jPlayer - - Resources/Public/JavaScript/jQuery - - Resources/Public/JavaScript/jQueryUI - - Resources/Public/JavaScript/OpenLayers - - Resources/Public/JavaScript/Toastify +paths-ignore: + - Resources/Public/JavaScript/jPlayer + - Resources/Public/JavaScript/jQuery + - Resources/Public/JavaScript/jQueryUI + - Resources/Public/JavaScript/OpenLayers + - Resources/Public/JavaScript/Toastify diff --git a/.github/phpstan.neon b/.github/phpstan.neon index 4f2fb950c..7307b130f 100644 --- a/.github/phpstan.neon +++ b/.github/phpstan.neon @@ -1,31 +1,31 @@ parameters: - ignoreErrors: - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::countByPid\(\)\.#' - - '#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\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByFeUserId\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByIndexName\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByLocation\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByPid\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByRecordId\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneBySessionId\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByType\(\)\.#' - - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByUid\(\)\.#' - - '#Call to an undefined method Psr\\Http\\Message\\RequestFactoryInterface::request\(\)\.#' - - '#Call to an undefined method Solarium\\Core\\Query\\DocumentInterface::setField\(\)\.#' - - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getHeight\(\)\.#' - - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getWidth\(\)\.#' - - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getPossibleTextAnnotationContainers\(\)\.#' - - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getTextAnnotations\(\)\.#' - - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\ManifestInterface::getOriginalJsonArray\(\)\.#' - - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\RangeInterface::getMemberRangesAndRanges\(\)\.#' - - '#Constant LOG_SEVERITY_ERROR not found\.#' - - '#Constant LOG_SEVERITY_NOTICE not found\.#' - - '#Constant LOG_SEVERITY_WARNING not found\.#' - - '#Constant TYPO3_MODE not found\.#' - level: 5 - paths: - - ../Classes/ - excludePaths: - - ../Classes/Controller/OaiPmhController.php - treatPhpDocTypesAsCertain: false + ignoreErrors: + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::countByPid\(\)\.#' + - '#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\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByFeUserId\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByIndexName\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByLocation\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByPid\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByRecordId\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneBySessionId\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByType\(\)\.#' + - '#Call to an undefined method Kitodo\\Dlf\\Domain\\Repository\\[a-zA-Z]+Repository::findOneByUid\(\)\.#' + - '#Call to an undefined method Psr\\Http\\Message\\RequestFactoryInterface::request\(\)\.#' + - '#Call to an undefined method Solarium\\Core\\Query\\DocumentInterface::setField\(\)\.#' + - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getHeight\(\)\.#' + - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getWidth\(\)\.#' + - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getPossibleTextAnnotationContainers\(\)\.#' + - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\IiifResourceInterface::getTextAnnotations\(\)\.#' + - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\ManifestInterface::getOriginalJsonArray\(\)\.#' + - '#Call to an undefined method Ubl\\Iiif\\Presentation\\Common\\Model\\Resources\\RangeInterface::getMemberRangesAndRanges\(\)\.#' + - '#Constant LOG_SEVERITY_ERROR not found\.#' + - '#Constant LOG_SEVERITY_NOTICE not found\.#' + - '#Constant LOG_SEVERITY_WARNING not found\.#' + - '#Constant TYPO3_MODE not found\.#' + level: 5 + paths: + - ../Classes/ + excludePaths: + - ../Classes/Controller/OaiPmhController.php + treatPhpDocTypesAsCertain: false diff --git a/.github/pull.yml b/.github/pull.yml index e00fbe74a..8ef8ba932 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -18,3 +18,6 @@ rules: - base: 4.x upstream: kitodo:4.x mergeMethod: hardreset + - base: 5.x + upstream: kitodo:5.x + mergeMethod: hardreset diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c17f1b765..12969e1e1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,14 +1,14 @@ -name: "CodeQL" +name: CodeQL on: push: - branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x" ] + branches: [ "master", "1.x", "2.x", "3.2.x", "3.3.x", "4.x", "5.x" ] pull_request: branches: [ "master" ] jobs: analyze: - name: Analyze + name: Static Code Analysis runs-on: ubuntu-latest permissions: actions: read diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 8180669aa..769245370 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -1,10 +1,10 @@ -name: Build Documentation +name: Documentation on: [ push, pull_request ] jobs: tests: - name: Documentation + name: Build Test runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 35c5266de..e998d5de5 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -8,6 +8,7 @@ on: jobs: phpstan: + name: Static Code Analysis runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 49233f11d..52e4a0e4a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,6 +8,7 @@ on: jobs: test: + name: TYPO3 runs-on: ubuntu-latest strategy: matrix: