File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed
Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -279,6 +279,10 @@ jobs:
279279 php-version : " 8.3"
280280 flavour : alpine
281281 template : https://github.com/shopware/shopware
282+ - shopware-version : v6.7.0.0-rc1
283+ php-version : " 8.3"
284+ flavour : alpine
285+ template : https://github.com/shopware/shopware
282286 - shopware-version : 6.4
283287 php-version : " 8.1"
284288 flavour : alpine
@@ -459,6 +463,10 @@ jobs:
459463 php-version : " 8.3"
460464 flavour : debian
461465 template : https://github.com/shopware/shopware
466+ - shopware-version : v6.7.0.0-rc1
467+ php-version : " 8.3"
468+ flavour : debian
469+ template : https://github.com/shopware/shopware
462470 - shopware-version : 6.4
463471 php-version : " 8.1"
464472 flavour : debian
Original file line number Diff line number Diff line change @@ -27,12 +27,12 @@ RUN \
2727 if [ -f composer.lock ]; then \
2828 composer install --no-interaction -o; \
2929 else \
30- if echo "${SHOPWARE_VERSION}" | grep -q '^trunk' ; then \
30+ if echo "${SHOPWARE_VERSION}" | grep -qE '^( trunk|v6 \. 7 \. ) ' ; then \
3131 jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
3232 fi && \
3333 composer update --prefer-lowest --prefer-stable --no-interaction -o; \
3434 fi && \
35- if echo "${SHOPWARE_VERSION}" | grep -q '^trunk' ; then \
35+ if echo "${SHOPWARE_VERSION}" | grep -qE '^( trunk|v6 \. 7 \. ) ' ; then \
3636 APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \
3737 else \
3838 APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \
Original file line number Diff line number Diff line change @@ -37,12 +37,12 @@ RUN \
3737 if [ -f composer.lock ]; then \
3838 composer install --no-interaction -o; \
3939 else \
40- if echo "${SHOPWARE_VERSION}" | grep -q '^trunk' ; then \
40+ if echo "${SHOPWARE_VERSION}" | grep -qE '^( trunk|v6 \. 7 \. ) ' ; then \
4141 jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
4242 fi && \
4343 composer update --prefer-lowest --prefer-stable --no-interaction -o; \
4444 fi && \
45- if echo "${SHOPWARE_VERSION}" | grep -q '^trunk' ; then \
45+ if echo "${SHOPWARE_VERSION}" | grep -qE '^( trunk|v6 \. 7 \. ) ' ; then \
4646 APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware -nq; \
4747 else \
4848 APP_URL="http://localhost" php bin/console system:setup --database-url=mysql://root:root@localhost:3306/shopware --generate-jwt-keys -nq; \
You can’t perform that action at this time.
0 commit comments