Remove unecessary files

pimcore · Nov 26, 2024 · 45790c6 · 45790c6
1 parent 32da746
commit 45790c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 50 deletions.
diff --git a/.github/ci/files/security.yaml b/.github/ci/files/security.yaml
diff --git a/.github/ci/scripts/setup-pimcore-environment.sh b/.github/ci/scripts/setup-pimcore-environment.sh
@@ -11,12 +11,4 @@ cp -r .github/ci/files/templates/. templates
 cp -r .github/ci/files/bin/console bin/console
 chmod 755 bin/console
 cp -r .github/ci/files/kernel/. kernel
-cp -r .github/ci/files/public/. public
-
-if [ ${REQUIRE_ADMIN_BUNDLE} = true ]; then
-    composer require -n --no-update pimcore/admin-ui-classic-bundle:^1.0
-else
-    ## Todo Remove when dropping support for Pimcore 10
-    rm config/packages/security.yaml
-    cp .github/ci/files/security.yaml config/packages
-fi
+cp -r .github/ci/files/public/. public
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -28,9 +28,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: 8.1, database: "mariadb:10.11", pimcore_version: "", dependencies: lowest, experimental: false, require_admin_bundle: false }
-                    - { 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", dependencies: highest, experimental: true, require_admin_bundle: true }
+                    - { php-version: 8.1, database: "mariadb:10.11", pimcore_version: "", dependencies: lowest, experimental: false }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", dependencies: highest, experimental: false }
+                    - { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "11.x-dev", dependencies: highest, experimental: true }
         services:
             mariadb:
                 image: "${{ matrix.database }}"
@@ -59,8 +59,6 @@ jobs:
                   done
 
             - name: "Setup Pimcore environment"
-              env:
-                  REQUIRE_ADMIN_BUNDLE: "${{ matrix.require_admin_bundle }}"
               run: |
                   mysql -e "CREATE DATABASE pimcore_test CHARSET=utf8mb4;"
                   chmod 755 .github/ci/scripts/setup-pimcore-environment.sh

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -19,9 +19,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: "8.1", dependencies: "lowest", 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", require_admin_bundle: true, experimental: true }
+                    - { php-version: "8.1", dependencies: "lowest" }
+                    - { php-version: "8.3", dependencies: "highest" }
+                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev", experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"
@@ -33,8 +33,6 @@ jobs:
                   php-version: "${{ matrix.php-version }}"
 
             - name: "Setup Pimcore environment"
-              env:
-                  REQUIRE_ADMIN_BUNDLE: "${{ matrix.require_admin_bundle }}"
               run: |
                   .github/ci/scripts/setup-pimcore-environment.sh