Merge pull request #766 from wirDesign-communication-AG/v3.0.15

v3.0.15
wirDesign-communication-AG · Nov 13, 2023 · 13e45e2 · 13e45e2
2 parents 493c7eb + 7af8927
commit 13e45e2
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 196 deletions.
diff --git a/.env b/.env
@@ -42,6 +42,7 @@ APP_COMMAND_INKSCAPE_ENFORCED=false
 APP_COMMAND_INKSCAPE_CALL=inkscape
 APP_FILE_READ_ONLY=
 APP_GOOGLE_ANALYTICS_EVENT_PREFIX=wirhub
+APP_SEARCH_DESIGN=default
 # Connections
 APP_MEDIACOCKPIT_LIBRARY_COLLECTION_ID=
 APP_MEDIACOCKPIT_LIBRARY_ATTRIBUTE_TYPE=ATT_MAM_Facetten

diff --git a/.env.test b/.env.test
@@ -1,12 +1,12 @@
 APP_ENV=test
 APP_SECRET=test
 APP_LOCALE=de
-APP_CACHE_DIR=/home/runner/var/cache
+APP_CACHE_DIR=/var/www/wirhub/var/cache
 PANTHER_APP_ENV=test
-PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --log-level=DEBUG --log-path=$(pwd)/build/debug"
-PANTHER_EXTERNAL_BASE_URI=http://localhost:8000
+PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --log-level=DEBUG --log-path=/var/www/wirhub/var/log"
+PANTHER_EXTERNAL_BASE_URI=http://localhost
 PANTHER_NO_SANDBOX=1
 PANTHER_WEB_SERVER_DIR=./public
-PANTHER_WEB_SERVER_ROUTER=$(pwd)/vendor/wirdesign-communications-ag/wirhub/Tests/Helper/router.php
-DATABASE_URL=sqlite:////home/runner/var/cache/wdc-styleguide.db
+PANTHER_WEB_SERVER_ROUTER=/var/www/wirhub/vendor/wirdesign-communications-ag/wirhub/Tests/Helper/router.php
+DATABASE_URL=sqlite:////var/www/wirhub/var/wdc-styleguide.db
 DATABASE_DRIVER=pdo_sqlite
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,26 +18,40 @@ jobs:
                     extensions: imagick, sqlite3
                     ini-values: error_log=/home/runner/.symfony5/log/php.log
 
-            -   name: Install Symfony Server
-                run: wget https://get.symfony.com/cli/installer -O - | bash
+            -   name: Install Webserver
+                run: |
+                    sudo apt install -y apache2 libapache2-mod-php8.2
 
-            -   name: Install dependencies
-                run: APP_ENV=test composer install --prefer-dist --no-progress
+            -   name: Move project to web
+                run: |
+                    sudo mkdir /var/www/wirhub
+                    sudo mv /home/runner/work/wirhub-app/wirhub-app/* /var/www/wirhub
+                    sudo mv /home/runner/work/wirhub-app/wirhub-app/.env* /var/www/wirhub
+                    sudo chown -R www-data:www-data /var/www
 
-            -   name: Dump environment
-                run: APP_ENV=test composer dump-env test
+            -   name: Prepare symfony
+                run: |
+                    sudo -u www-data composer install --prefer-dist --no-progress --no-scripts --working-dir /var/www/wirhub
+                    sudo -u www-data composer dump-env test --working-dir /var/www/wirhub
+                    sudo -u www-data php /var/www/wirhub/bin/console cache:clear
+                    sudo -u www-data php /var/www/wirhub/bin/console assets:install public/
+                    sudo -u www-data php /var/www/wirhub/bin/console doctrine:database:create
+                    sudo -u www-data mkdir /var/www/wirhub/var/cache/test/sessions 
 
-            -   name: Clear cache
-                run: APP_ENV=test php bin/console cache:clear
+            -   name: Update folder permissions
+                run: |
+                    sudo chmod -R 777 /var/www/wirhub
 
-            -   name: Recreate assets
-                run: APP_ENV=test php bin/console assets:install public/
-
-            -   name: Start Server
-                run: APP_ENV=test /home/runner/.symfony5/bin/symfony server:start -d --no-tls
+            -   name: Finish webserver
+                run: |
+                    sudo rm /etc/apache2/sites-available/000-default.conf
+                    sudo cp /var/www/wirhub/vendor/wirdesign-communication-ag/wirhub/Tests/Config/vhost_github.conf /etc/apache2/sites-available/000-default.conf
+                    
+                    sudo a2enmod rewrite
+                    sudo systemctl restart apache2
 
             -   name: Run tests
-                run: chmod -R 0777 ./ && make test
+                run: cd /var/www/wirhub && make test
 
             -   name: Archive debugging files
                 uses: actions/upload-artifact@v3
@@ -46,9 +60,8 @@ jobs:
                     name: debug
                     if-no-files-found: ignore
                     path: |
-                        .env.local.php
-                        vendor/wirdesign-communication-ag/wirhub/build/debug/*
-                        var/cache/test/*.log
-                        var/log/*.log
-                        ~/var/cache/wdc-styleguide.db
-                        ~/.symfony5/log/*.log
+                        /var/www/wirhub/.env.local.php
+                        /var/www/wirhub/vendor/wirdesign-communication-ag/wirhub/build/debug/*
+                        /var/www/wirhub/var/cache/test/*.log
+                        /var/www/wirhub/var/cache/wdc-styleguide.db
+                        /var/www/wirhub/var/log/*
diff --git a/composer.json b/composer.json
@@ -45,7 +45,8 @@
         "symfony/polyfill-php73": "*",
         "symfony/polyfill-php74": "*",
         "symfony/polyfill-php80": "*",
-        "symfony/polyfill-php81": "*"
+        "symfony/polyfill-php81": "*",
+        "symfony/polyfill-php82": "*"
     },
     "repositories": [
         {
@@ -74,7 +75,7 @@
         "symfony/framework-bundle": "6.3.*",
         "symfony/runtime": "6.3.*",
         "symfony/yaml": "6.3.*",
-        "wirdesign-communication-ag/wirhub": "^3.0.14"
+        "wirdesign-communication-ag/wirhub": "v3.0.15.x-dev"
     },
     "scripts": {
         "auto-scripts": {