From d893558a29c792ed569bebb1e7aa2a22335c2227 Mon Sep 17 00:00:00 2001 From: Christian Fasching Date: Wed, 13 Dec 2023 09:45:22 +0100 Subject: [PATCH] Prepare 2022.0 (LTS) (#17) * prepare 2022.0 (LTS) * Update 01-setup-environment.sh * prepared for 2022.0 * prepared for 2022.0 * switch to private packagist * Update integration-test.yml --- .github/scripts/01-setup-environment.sh | 6 ++-- .github/workflows/integration-test.yml | 2 +- composer.json | 44 ++++++++++++------------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/scripts/01-setup-environment.sh b/.github/scripts/01-setup-environment.sh index b5c584d..b63fa59 100755 --- a/.github/scripts/01-setup-environment.sh +++ b/.github/scripts/01-setup-environment.sh @@ -15,7 +15,7 @@ docker run \ -u `id -u`:`id -g` --rm \ -v `pwd`:/var/www/html \ pimcore/pimcore:php8.1-latest \ - composer create-project pimcore/skeleton test-project + composer create-project pimcore/skeleton:^10 test-project cd test-project/ @@ -43,9 +43,9 @@ docker compose up -d # add platform version +docker compose exec -T -- php composer config --global --auth http-basic.pimcore.repo.packagist.com token $1 +docker compose exec -T -- php composer config repositories.pimcore_enterprise composer https://pimcore.repo.packagist.com/github-actions/ docker compose exec -T -- php composer config repositories.dev path "./platform-version" -docker compose exec -T -- php composer config --global --auth http-basic.enterprise.repo.pimcore.com token $1 -docker compose exec -T -- php composer config repositories.pimcore_enterprise composer https://enterprise.repo.pimcore.com/ docker compose exec -T -- php composer config minimum-stability dev docker compose exec -T -- php composer config prefer-stable true diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index a1aa9cf..5746f81 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -26,7 +26,7 @@ jobs: working-directory: "./platform-version-working-dir" run: | chmod 755 ../platform-version/.github/scripts/01-setup-environment.sh - ../platform-version/.github/scripts/01-setup-environment.sh ${{ secrets.ENTERPRISE_REPOSITORY_TOKEN }} + ../platform-version/.github/scripts/01-setup-environment.sh ${{ secrets.PRIVATE_PACKAGIST_REPOSITORY_TOKEN }} - name: Install Pimcore working-directory: "./platform-version-working-dir/test-project" diff --git a/composer.json b/composer.json index a1aaa8c..8a89ad1 100644 --- a/composer.json +++ b/composer.json @@ -4,27 +4,27 @@ "description": "Verified Pimcore Version", "license": "PCL", "conflict": { - "pimcore/asset-metadata-class-definitions": "!=2.x-dev", - "pimcore/data-hub-ci-hub": "!=1.x-dev", - "pimcore/data-hub-file-export": "!=2.x-dev", - "pimcore/data-hub-productsup": "!=1.3.x-dev", - "pimcore/data-hub-simple-rest": "!=2.x-dev", - "pimcore/direct-edit": "!=2.x-dev", - "pimcore/headless-documents": "!=2.x-dev", - "pimcore/openid-connect": "!=1.x-dev", - "pimcore/portal-engine": "!=3.x-dev", - "pimcore/statistics-explorer": "!=2.x-dev", - "pimcore/translations-provider-interfaces": "!=3.x-dev", - "pimcore/workflow-designer": "!=1.x-dev", - "pimcore/data-importer": "!=1.x-dev", - "pimcore/data-hub": "!=1.x-dev", - "pimcore/customer-management-framework-bundle": "!=3.4.x-dev", - "pimcore/web2print-tools-bundle": "!=5.x-dev", - "pimcore/perspective-editor": "!=1.x-dev", - "pimcore/output-data-config-toolkit-bundle": "!=4.1.x-dev", - "pimcore/object-merger": "!=3.0.x-dev", - "pimcore/frontend-permission-toolkit-bundle": "!=1.5.x-dev", - "pimcore/advanced-object-search": "!=5.x-dev", - "pimcore/pimcore": "!=10.6.x-dev" + "pimcore/asset-metadata-class-definitions": "<2.0 || > 2.0.99", + "pimcore/data-hub-ci-hub": "<1.2 || > 1.2.99", + "pimcore/data-hub-file-export": "<2.0 || > 2.0.99", + "pimcore/data-hub-productsup": "<1.3 || > 1.3.99", + "pimcore/data-hub-simple-rest": "<2.0 || > 2.0.99", + "pimcore/direct-edit": "<2.0 || > 2.0.99", + "pimcore/headless-documents": "<2.0 || > 2.0.99", + "pimcore/openid-connect": "<1.1 || > 1.1.99", + "pimcore/portal-engine": "<3.1 || > 3.1.99", + "pimcore/statistics-explorer": "<2.0 || > 2.0.99", + "pimcore/translations-provider-interfaces": "<3.0 || > 3.0.99", + "pimcore/workflow-designer": "<1.1 || > 1.1.99", + "pimcore/data-importer": "<1.8 || > 1.8.99", + "pimcore/data-hub": "<1.6 || > 1.6.99", + "pimcore/customer-management-framework-bundle": "<3.4 || > 3.4.99", + "pimcore/web2print-tools-bundle": "<4.0 || > 4.0.99", + "pimcore/perspective-editor": "<1.6 || > 1.6.99", + "pimcore/output-data-config-toolkit-bundle": "<4.1 || > 4.1.99", + "pimcore/object-merger": "<3.0 || > 3.0.99", + "pimcore/frontend-permission-toolkit-bundle": "<1.5 || > 1.5.99", + "pimcore/advanced-object-search": "<5.0 || > 5.0.99", + "pimcore/pimcore": "<10.6 || > 10.6.99" } }