Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
strategy:
matrix:
php_version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"
node_version:
- 16
- 18
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
integration_test:
strategy:
matrix:
php_version: [8.1, 8.2, 8.3]
php_version: [8.2, 8.3, 8.4]
testsuite: [general, brancher]
runs-on: ubuntu-latest
steps:
Expand All @@ -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.3' }}
if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.4' }}
uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- name: Run brancher testsuite
if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.3' }}
if: ${{ matrix.testsuite == 'brancher' && matrix.php_version == '8.4' }}
run: ./runtests.sh brancher
shell: bash
env:
Expand All @@ -34,7 +34,7 @@ jobs:
code_quality:
strategy:
matrix:
php_version: [7.4, 8.1, 8.2, 8.3]
php_version: [8.1, 8.2, 8.3, 8.4]
runs-on: ubuntu-latest
steps:
- name: Checkout hypernode-deploy
Expand Down
7 changes: 6 additions & 1 deletion ci/test/run-general.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ set -e
set -x

export PHP_VERSION_SHORT=$(echo "${PHP_VERSION:-8.2}" | sed 's/\.//')
if [[ "${PHP_VERSION:-8.2}" == "8.4" ]]; then
export IMAGE_OS="bookworm"
else
export IMAGE_OS="buster"
fi

# Handy aliases
HN="docker-compose exec -T hypernode"
Expand Down Expand Up @@ -59,7 +64,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.7-p3 /data/web/magento2
$HN composer create-project --repository=https://mirror.mage-os.org/ magento/project-community-edition:2.4.8 /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
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"guzzlehttp/guzzle": "^7.5",
"hypernode/api-client": "^0.4",
"hypernode/deploy-configuration": "^3.4",
"php-di/php-di": "^6.0",
"php-di/php-di": "^7.0",
"psr/log": "^1.0",
"symfony/console": "^5.4",
"symfony/finder": "^5.4",
Expand All @@ -36,9 +36,9 @@
},
"require-dev": {
"phpro/grumphp-shim": "^1.13",
"phpunit/phpunit": "^8.5",
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.7",
"vimeo/psalm": "^4.26"
"vimeo/psalm": "^6.0"
},
"config": {
"preferred-install": {
Expand Down
Loading
Loading