Skip to content

Commit

Permalink
Add platform-version (#578)
Browse files Browse the repository at this point in the history
* add platform-version

* Update composer.json

* Update pimcore-demo.yml

* Update composer.json

* apply alias changes

---------

Co-authored-by: JiaJia Ji <[email protected]>
  • Loading branch information
fashxp and kingjia90 authored Jul 2, 2024
1 parent e2cd5b1 commit 26d7ce2
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 12 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/pimcore-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
strategy:
matrix:
include:
- { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "", experimental: true }
- { php-version: 8.2, database: "mariadb:10.11", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.0.0", experimental: true }
- { php-version: 8.2, database: "mysql:latest", pimcore_version: "", experimental: true }
- { php-version: 8.2, database: "mysql:latest", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.0.0", experimental: true }
- { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", experimental: true }
- { php-version: 8.3, database: "mariadb:10.11", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.3.99", experimental: true }
- { php-version: 8.3, database: "mysql:latest", pimcore_version: "", experimental: true }
- { php-version: 8.3, database: "mysql:latest", pimcore_version: "", pimcore_upgrade_version: "11.x-dev as 11.3.99", experimental: true }
steps:
# Check out the repo in a sub-dir to see if it can serve as
# template for `composer create-project`
Expand Down Expand Up @@ -134,6 +134,7 @@ jobs:
set -ex
cd sample-project/
docker-compose exec -T -- php composer remove pimcore/platform-version --no-update
docker-compose exec -T -- php composer require pimcore/pimcore:"${UPGRADE_VERSION}"
# Run pimcore migration.
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ You don't need to have a PHP environment with composer installed.
* The admin interface, using the credentials you have chosen above:
<http://localhost/admin>

## Pimcore Platform Version
By default, Pimcore Platform Version is added as a dependency which ensures installation of compatible and in combination
with each other tested versions of additional Pimcore modules. More information about the Platform Version can be found in the
[Platform Version docs](https://github.com/pimcore/platform-version).

It might be necessary to update a specific Pimcore module to a version that is not included in the Platform Version.
In that case, you need to remove the `platform-version` dependency from your `composer.json` and update the module to
the desired version.
Be aware that this might lead to a theoretically compatible but untested combination of Pimcore modules.

## Other demo/skeleton packages
- [Pimcore Skeleton](https://github.com/pimcore/skeleton/)
17 changes: 9 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
"require": {
"php-http/guzzle7-adapter": "^0.1.1",
"php-http/httplug-bundle": "^1",
"pimcore/customer-management-framework-bundle": "^4.0",
"pimcore/pimcore": "^11.1",
"pimcore/web2print-tools-bundle": "^5.0",
"pimcore/data-hub": "^1.6",
"pimcore/platform-version": "^2024.2",
"pimcore/customer-management-framework-bundle": "*",
"pimcore/pimcore": "*",
"pimcore/web2print-tools-bundle": "*",
"pimcore/data-hub": "*",
"pimcore/payment-provider-paypal-smart-payment-button": "^2.0",
"pimcore/admin-ui-classic-bundle": "^1.2",
"pimcore/ecommerce-framework-bundle": "^1.0",
"pimcore/web-to-print-bundle": "^1.0",
"pimcore/newsletter-bundle": "^1.0",
"pimcore/admin-ui-classic-bundle": "*",
"pimcore/ecommerce-framework-bundle": "*",
"pimcore/web-to-print-bundle": "*",
"pimcore/newsletter-bundle": "*",
"symfony/runtime": "^6.2",
"symfony/intl": "^6.2",
"symfony/dotenv": "^6.2",
Expand Down

0 comments on commit 26d7ce2

Please sign in to comment.