Skip to content

Add PHP8.1 through PHP8.4 to Integration tests, remove dev depedencies from build #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
poespas merged 6 commits into from
May 13, 2025
Merged

Add PHP8.1 through PHP8.4 to Integration tests, remove dev depedencies from build #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4414068
Add PHP8.0 through PHP8.4 to Integration tests, remove dev depedencie…
May 12, 2025
0844a4a
Escape PHP 8.0 in integration test matrix item
May 12, 2025
6a95efa
Use seperate magento versions for php versions
May 12, 2025
456dde3
Fix syntax for switching magento versions to test
May 12, 2025
68ece72
Fix syntax for switching magento versions to test
May 12, 2025
6bb9ec8
Remove php 8.0 from integration tests
May 12, 2025
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/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
integration_test:
strategy:
matrix:
php_version: [8.2, 8.3, 8.4]
php_version: [8.1, 8.2, 8.3, 8.4]
testsuite: [general, brancher]
runs-on: ubuntu-latest
steps:
Expand Down
10 changes: 8 additions & 2 deletions ci/build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,14 @@ COPY ./ci/build/files /

RUN curl -sS https://getcomposer.org/installer | php \
&& mv composer.phar /usr/local/bin/composer \
&& chmod +x /usr/local/bin/composer \
&& composer install --no-dev --optimize-autoloader --working-dir=/hypernode
&& chmod +x /usr/local/bin/composer

# Remove dev dependencies from composer.json
Copy link
Collaborator Author

@poespas poespas May 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have the wierd case that only our dev dependencies (psalm) have the hard limit for PHP 8.1. There's no way to remove this check except entirely disabling the platform requirements. That's why we remove dev-require in the production docker build

RUN cd /hypernode && \
jq 'del(.["require-dev"])' composer.json > composer.tmp.json && \
cp composer.tmp.json composer.json

RUN composer install --no-dev --optimize-autoloader --working-dir=/hypernode --no-scripts --no-progress --no-interaction

RUN bash /hypernode/ci/compile.sh

Expand Down
8 changes: 7 additions & 1 deletion ci/test/run-general.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ else
export IMAGE_OS="buster"
fi

if [[ "${PHP_VERSION:-8.2}" == "8.0" || "${PHP_VERSION:-8.2}" == "8.1" ]]; then
export MAGENTO_VERSION="2.4.6-p10"
else
export MAGENTO_VERSION="2.4.8"
fi

# Handy aliases
HN="docker-compose exec -T hypernode"
DP="docker-compose exec -e GITHUB_WORKFLOW -T deploy"
Expand Down Expand Up @@ -64,7 +70,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.8 /data/web/magento2
$HN composer create-project --repository=https://mirror.mage-os.org/ magento/project-community-edition:${MAGENTO_VERSION:-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
Loading