Merge branch '1.9' into bugfix/corrupt-preview

.github/workflows/cla.yml

@@ -1,34 +1,14 @@
-name: "CLA Assistant"
+name: CLA check
+
 on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened,closed,synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
-  CLAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        # Beta Release
-        uses: cla-assistant/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-        with:
-          path-to-signatures: 'signatures/version1/cla.json'
-          path-to-document: 'https://github.com/pimcore/pimcore/blob/master/CLA.md' # e.g. a CLA or a DCO document
-          # branch should not be protected
-          branch: 'main'
-          allowlist: user1,bot*
-
-         #below are the optional inputs - If the optional inputs are not given, then default values will be taken
-          remote-organization-name: 'pimcore' #enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
-          remote-repository-name: 'cla'
-          #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
-          #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
-          #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
-          #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-          #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
+  cla-workflow:
+    uses: pimcore/workflows-collection-public/.github/workflows/[email protected]
+    if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+    secrets:
+      CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}

.github/workflows/codeception.yml

@@ -29,8 +29,8 @@ jobs:
             matrix:
                 include:
                     - { php-version: 8.0, database: "mariadb:10.3", pimcore_version: "", dependencies: lowest, experimental: false, require_admin_bundle: false }
-                    - { php-version: 8.1, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false, require_admin_bundle: true }
-                    - { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "11.x-dev as 11.0.0", dependencies: highest, experimental: true, require_admin_bundle: true }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false, require_admin_bundle: true }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev as 11.0.0", dependencies: highest, experimental: true, require_admin_bundle: true }
         services:
             mariadb:
                 image: "${{ matrix.database }}"

.github/workflows/docs.yaml

@@ -0,0 +1,71 @@
+
+name: "Documentation"
+
+on:
+    pull_request_target:
+        branches:
+            - "[0-9]+.[0-9]+"
+            - "[0-9]+.x"
+        paths:
+            - 'doc/**'
+            - '.github/workflows/docs.yaml'
+            - 'README.md'            
+    push:
+        branches:
+            - "[0-9]+.[0-9]+"
+            - "[0-9]+.x"
+            - "*_actions"
+        paths:
+            - 'doc/**'
+            - '.github/workflows/docs.yaml'
+            - 'README.md'                
+
+permissions:
+  contents: read
+
+jobs:
+    docs:
+        name: "Generate docs Pimcore Docs Generator"
+        runs-on: "ubuntu-latest"
+        if: ${{ github.repository == 'pimcore/data-importer' }}
+        steps:
+            - name: "Checkout code"
+              uses: "actions/checkout@v3"
+              with:
+                ref: ${{ github.event.pull_request.head.sha }}              
+
+            - name: "Checkout Docs Generator"
+              uses: "actions/checkout@v3"
+              with:
+                  repository: "pimcore/docs-generator"
+                  ref: "main"
+                  path: "./docs-generator"
+                  token: ${{ secrets.DOCS_GENERATOR_ACCESS_TOKEN }}
+
+            - name: "Install Node"
+              uses: actions/setup-node@v3
+              with:
+                  node-version: 19.x
+                  registry-url: 'https://registry.npmjs.org'
+
+            - name: Prepare Docs
+              working-directory: "./docs-generator"
+              run: |
+                  mkdir docs
+                  # copy docs to working directory
+                  cp -r ../doc ./docs/
+                  
+                  # copy readme to working directory
+                  cp -r ../README.md ./docs/
+                  
+                  # copy index page
+                  cp bin/resources/00_index_empty.md  ./docs/00_index.md
+                  
+                  # use special docusaurus config (to exclude search plugin) and check for broken links
+                  mv docusaurus.config.js.repos-tests docusaurus.config.js
+                  
+            - name: Build Docs
+              working-directory: "./docs-generator"
+              run: |
+                  npm install
+                  npm run build

.github/workflows/poeditor-export.yaml

@@ -14,9 +14,10 @@ permissions:
 jobs:
     poeditor:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'pimcore/data-importer' }}
         steps:
             - name: Trigger workflow in pimcore/poeditor-export-action
               env:
                   GH_TOKEN: ${{ secrets.POEDITOR_ACTION_TRIGGER_TOKEN }}
               run: |
-                  gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml
+                  gh workflow run -R pimcore/poeditor-export-action poeditor-export.yaml

.github/workflows/stale.yml

@@ -0,0 +1,10 @@
+name: Handle stale issues
+
+on:
+  workflow_dispatch:
+  schedule:
+      - cron: '37 7 * * *'
+
+jobs:
+  call-stale-workflow:
+    uses: pimcore/workflows-collection-public/.github/workflows/[email protected]

.github/workflows/static-analysis.yml

@@ -20,8 +20,8 @@ jobs:
             matrix:
                 include:
                     - { php-version: "8.0", dependencies: "lowest", require_admin_bundle: false }
-                    - { php-version: "8.1", dependencies: "highest", require_admin_bundle: true }
-                    - { php-version: "8.2", dependencies: "highest", require_admin_bundle: true }
+                    - { php-version: "8.3", dependencies: "highest", require_admin_bundle: true }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.0.0", require_admin_bundle: true, experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"
@@ -38,6 +38,14 @@ jobs:
               run: |
                   .github/ci/scripts/setup-pimcore-environment.sh
 
+            - name: "Update Pimcore version"
+              env:
+                  PIMCORE_VERSION: "${{ matrix.pimcore_version }}"
+              run: |
+                  if [ ! -z "$PIMCORE_VERSION" ]; then
+                        composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}"
+                  fi  
+
             - name: "Install dependencies with Composer"
               uses: "ramsey/composer-install@v2"
               with: