From bece1fad7df26fc9e0537818b7d6c8ce60f55736 Mon Sep 17 00:00:00 2001
From: Timon de Groot <timon.degroot@hypernode.com>
Date: Wed, 17 Jan 2024 12:10:15 +0100
Subject: [PATCH] ci: Build PHP 8.3 image

Also bump other default settings from 8.1 to 8.2
---
 .github/workflows/publish.yaml | 3 ++-
 .github/workflows/test.yaml    | 8 ++++----
 ci/test/run-general.sh         | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index cf769d2..d64b832 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -12,6 +12,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
         node_version:
           - 12
           - 14
@@ -21,7 +22,7 @@ jobs:
     env:
       PHP_VERSION: ${{ matrix.php_version }}
       NODE_VERSION: ${{ matrix.node_version }}
-      LATEST_PHP_VERSION: 8.1
+      LATEST_PHP_VERSION: 8.3
       LATEST_NODE_VERSION: 18
     steps:
       - name: Checkout hypernode-deploy
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 07848ac..2e442eb 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,7 +6,7 @@ jobs:
   integration_test:
     strategy:
       matrix:
-        php_version: [7.4, 8.1]  # 8.2 is disabled for now, since Magento 2 does not support this yet.
+        php_version: [8.1, 8.2]  # 8.3 is disabled for now, since Magento 2 does not support this yet.
         testsuite: [general, brancher]
     runs-on: ubuntu-latest
     steps:
@@ -19,12 +19,12 @@ jobs:
         env:
           PHP_VERSION: ${{ matrix.php_version }}
       - name: Start SSH agent for brancher testsuite
-        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.1' }}
+        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.2' }}
         uses: webfactory/ssh-agent@v0.5.4
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
       - name: Run brancher testsuite
-        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.1' }}
+        if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.2' }}
         run: ./runtests.sh brancher
         shell: bash
         env:
@@ -34,7 +34,7 @@ jobs:
   code_quality:
     strategy:
       matrix:
-        php_version: [7.4, 8.1, 8.2]
+        php_version: [7.4, 8.1, 8.2, 8.3]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout hypernode-deploy
diff --git a/ci/test/run-general.sh b/ci/test/run-general.sh
index db68d05..b293098 100755
--- a/ci/test/run-general.sh
+++ b/ci/test/run-general.sh
@@ -58,7 +58,7 @@ end_task
 
 begin_task "Setting Magento 2"
 # Create working initial Magento install on the Hypernode container
-$HN composer create-project --repository=https://mirror.mage-os.org/ magento/project-community-edition:2.4.5-p2 /data/web/magento2
+$HN composer create-project --repository=https://mirror.mage-os.org/ magento/project-community-edition:2.4.6-p3 /data/web/magento2
 echo "Waiting for MySQL to be available on the Hypernode container"
 $HN bash -c "until mysql -e 'select 1' ; do sleep 1; done"
 install_magento