OXDEV-9270 Fix GHA

Author: moritzdemmer

.github/workflows/development.yml

@@ -4,25 +4,27 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  schedule:
-    - cron: '0 9 * * 1'
+    inputs:
+      shop_branch:
+        description: 'Branch of oxideshop-ce to use'
+        required: false
 
 jobs:
   run_tests:
     env:
-      INSTALL_DIR: migration_wrapper
+      SHOP_BRANCH: ${{ inputs.shop_branch || 'b-7.5.x' }}
     strategy:
       matrix:
         php: [ '8.3', '8.4', '8.5' ]
         mysql: [ '8.0', '8.4' ]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - name: Clone Docker Eshop SDK
+      - name: Clone testing environment
         run: git clone --depth 1 https://github.com/OXID-eSales/docker-eshop-sdk.git --branch master --single-branch .
 
-      - name: Clone Migration Wrapper (on default branch - ${{ github.event.repository.default_branch }})
-        run: git clone --branch ${{ github.ref_name }} https://github.com/OXID-eSales/oxideshop-doctrine-migration-wrapper.git source/$INSTALL_DIR
+      - name: Clone the shop
+        run: git clone --depth 1 https://github.com/OXID-eSales/oxideshop_ce.git --branch ${{ env.SHOP_BRANCH }} --single-branch source
 
       - name: Prepare container configuration
         run: |
@@ -33,39 +35,48 @@ jobs:
               -e "s#MYSQL_VERSION=.*#MYSQL_VERSION='${{ matrix.mysql }}'#g;"\
               .env
           perl -pi\
-              -e 's#display_errors =.*#display_errors = true#g;'\
-              -e 'print "xdebug.max_nesting_level=1000\n\n";'\
-              -e 'print "error_reporting = E_ALL & ~E_DEPRECATED & ~E_NOTICE & ~E_WARNING\n"'\
-              containers/php/custom.ini
-          perl -pi\
-              -e 's#/var/www/#/var/www/$INSTALL_DIR/source/#g;'\
+              -e 's#/var/www/#/var/www/source/#g;'\
               containers/httpd/project.conf
 
+      - name: Prepare shop configuration
+        run: |
+          cp source/source/config.inc.php.dist source/source/config.inc.php
+          perl -pi\
+            -e 's#<dbHost>#mysql#g;'\
+            -e 's#<dbUser>#root#g;'\
+            -e 's#<dbName>#example#g;'\
+            -e 's#<dbPwd>#root#g;'\
+            -e 's#<dbPort>#3306#g;'\
+            -e 's#<sShopURL>#http://localhost.local/#g;'\
+            -e 's#<sShopDir>#/var/www/source/#g;'\
+            -e 's#<sCompileDir>#/var/www/source/tmp/#g;'\
+            source/source/config.inc.php
+
       - name: Start containers
         run: |
           make up
           sleep 2
 
-      - name: Install Composer dependencies (on default branch - ${{ github.event.repository.default_branch }})
+      - name: Install shop and component
         run: |
-          docker compose exec -T -w /var/www/$INSTALL_DIR php \
-            composer config allow-plugins.oxid-esales/oxideshop-unified-namespace-generator true
-          docker compose exec -T -w /var/www/$INSTALL_DIR php \
-            composer config allow-plugins.oxid-esales/oxideshop-composer-plugin true
-          docker compose exec -T -w /var/www/$INSTALL_DIR php \
-            composer install --no-interaction
+          docker compose exec -T php composer config preferred-install.oxid-esales/* source
+          docker compose exec -T php composer require oxid-esales/oxideshop-doctrine-migration-wrapper:dev-${{ github.ref_name }} --prefer-source --no-interaction
+          cd source && sed -i 's|"OxidEsales\\\\EshopCommunity\\\\Tests\\\\|"OxidEsales\\\\DoctrineMigrationWrapper\\\\Tests\\\\": "vendor/oxid-esales/oxideshop-doctrine-migration-wrapper/tests",\n        "OxidEsales\\\\EshopCommunity\\\\Tests\\\\|' composer.json
+          docker compose exec -T php composer dump-autoload
 
-      - name: Install Shop
-        run: |
-          docker compose exec -T -w /var/www/$INSTALL_DIR php \
-            vendor/bin/oe-console oe:setup:shop --db-host mysql --db-port 3306 --db-name example --db-user root --db-password root --shop-url localhost.localhost --shop-directory /var/www/$INSTALL_DIR/source/ --compile-directory /var/www/$INSTALL_DIR/source/tmp/
+      - name: Reset shop
+        run: docker compose exec -T php php bin/oe-console oe:database:reset --db-host=mysql --db-port=3306 --db-name=example --db-user=root --db-password=root --force
 
       - name: Run tests
         run: |
-          docker compose exec -T -e ACTIONS_RUNNER_DEBUG=true -w /var/www/$INSTALL_DIR php \
-            php vendor/bin/phpunit --bootstrap /var/www/$INSTALL_DIR/source/bootstrap.php tests/
+          docker compose exec -T php php vendor/bin/phpunit vendor/oxid-esales/oxideshop-doctrine-migration-wrapper/tests --bootstrap=/var/www/source/bootstrap.php | tee PHP${{ matrix.php }}_MYSQL${{ matrix.mysql }}_phpunit_log.txt 2>&1 || true
+          if grep -q -Ei 'fail|\\.\\=\\=|Warning|Deprecated|Fatal|Error' PHP${{ matrix.php }}_MYSQL${{ matrix.mysql }}_phpunit_log.txt; then exit 1; fi
 
-      - name: Stop containers
-        run: |
-          docker compose down
-          sleep 2
+      - name: Upload PHPUnit Log
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: phpunit-logs-PHP${{ matrix.php }}-MYSQL${{ matrix.mysql }}
+          path: PHP${{ matrix.php }}_MYSQL${{ matrix.mysql }}_phpunit_log.txt
+          if-no-files-found: error
+          retention-days: 7

composer.json

@@ -11,7 +11,6 @@
     "require-dev": {
         "ext-pdo": "*",
         "mikey179/vfsstream": "^1.6",
-        "oxid-esales/oxideshop-ce": "*",
         "phpspec/prophecy-phpunit": "^v2.0",
         "symfony/filesystem": "*",
         "symfony/yaml": "*"