OXDEV-7728 Change php version and fix custom script in GHA

OXID-eSales · Mar 29, 2024 · 6857880 · 6857880
1 parent 2e3a14e
commit 6857880
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/oxid-esales/graphql-storefront.yml b/.github/oxid-esales/graphql-storefront.yml
@@ -3,7 +3,7 @@
 # {{ $name := "graphql-storefront" }}name: {{ print $name }}
 prepare_shop:
     specific: &specific_matrix
-        php: '["8.1"]'
+        php: '["8.2"]'
         mysql: '["8.0"]'
     git:
         shop_ref: '{{ .Data.global.git.default_ref }}'
@@ -46,13 +46,16 @@ install_module:
     activate: |
         oe_graphql_base
         {{ print $ids }}
+    custom_script: |
+        perl -pi -e 'print "SetEnvIf Authorization \"(.*)\" HTTP_AUTHORIZATION=\$1\n\n" if $. == 1' source/source/.htaccess
+        sed -i 's/<?php/<?php\n\nrequire(__DIR__ . "\/..\/c3.php");/' source/source/bootstrap.php
+    custom_script_container:
+        bin/oe-console oe:setup:demodata
 
 phpunit:
     matrix:
         testplan: '["~/defaults/module_phpunit_unit.yml","~/defaults/module_phpunit_integration.yml"]'
     load_shop: *install_module_prefix
-    custom_script_container:
-        bin/oe-console oe:setup:demodata
 
 runtest:
     matrix:
@@ -73,9 +76,6 @@ codeception:
     container:
         options: '-e SELENIUM_SERVER_HOST=selenium -e BROWSER_NAME=chrome -e ACTIVE_THEME=apex -e XDEBUG_MODE=coverage -e THEME_ID=apex'
     suite: 'Acceptance'
-    custom_script: |
-        perl -pi -e 'print "SetEnvIf Authorization \"(.*)\" HTTP_AUTHORIZATION=\$1\n\n" if $. == 1' source/source/.htaccess
-        sed -i 's/<?php/<?php\n\nrequire(__DIR__ . "\/..\/c3.php");/' source/source/bootstrap.php
 
 phpcs_tests:
     matrix:

diff --git a/.github/workflows/pull_module_71x.yml b/.github/workflows/pull_module_71x.yml
@@ -9,7 +9,7 @@ jobs:
     pull_module:
         uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
         with:
-            testplan: '~/defaults/7.1.x.yml,~/defaults/php8.1_mysql8.0_only.yml,~/graphql-storefront.yml'
+            testplan: '~/defaults/7.1.x.yml,~/defaults/php8.2_mysql8.0_only.yml,~/graphql-storefront.yml'
             runs_on: '"ubuntu-latest"'
             defaults: 'v4'
             plan_folder: '.github/oxid-esales'

diff --git a/.github/workflows/push_module_71x.yml b/.github/workflows/push_module_71x.yml
@@ -9,7 +9,7 @@ jobs:
     push_module:
         uses: oxid-eSales/github-actions/.github/workflows/call-universal_test_workflow.yml@v4
         with:
-            testplan: '~/defaults/7.1.x.yml,~/defaults/php8.1_mysql8.0_only.yml,~/graphql-storefront.yml'
+            testplan: '~/defaults/7.1.x.yml,~/defaults/php8.2_mysql8.0_only.yml,~/graphql-storefront.yml'
             runs_on: '"ubuntu-latest"'
             defaults: 'v4'
             plan_folder: '.github/oxid-esales'