Skip to content

Commit bc3685f

Browse files
WIP
1 parent 7c8382d commit bc3685f

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

.github/workflows/magento-2.4.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@ jobs:
7777
- name: Run setup:di:compile
7878
run: docker exec magento-project-community-edition ./retry "php bin/magento setup:di:compile"
7979

80-
- name: Run the example test
81-
continue-on-error: true
82-
run: docker exec magento-project-community-edition bash -c "cd /data/dev/tests/integration/ && ../../../vendor/bin/phpunit /data/vendor/michielgerritsen/exampletest/Test/Integration/ExampleTest.php"
83-
84-
- name: Run setup:di:compile
85-
run: docker exec magento-project-community-edition ./retry "php bin/magento setup:di:compile"
86-
8780
- name: Run the example test
8881
run: docker exec magento-project-community-edition bash -c "cd /data/dev/tests/integration/ && ../../../vendor/bin/phpunit /data/vendor/michielgerritsen/exampletest/Test/Integration/ExampleTest.php"
8982

magento/Dockerfile-2.4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ RUN set -e; \
7373
if [ "${SAMPLE_DATA}" = "true" ] && [ "$MAGENTO_VERSION" != "2.4.8-beta2" ]; then echo "[cad] Running php bin/magento sampledata:deploy"; php bin/magento sampledata:deploy; fi && \
7474
if [ "${SAMPLE_DATA}" = "true" ] && [ "$MAGENTO_VERSION" = "2.4.8-beta2" ]; then echo "[cad] Installing sampledata"; composer require magento/module-bundle-sample-data magento/module-catalog-sample-data magento/module-sales-sample-data magento/module-customer-sample-data magento/module-cms-sample-data magento/module-widget-sample-data magento/module-theme-sample-data magento/module-downloadable-sample-data magento/module-wishlist-sample-data magento/module-review-sample-data magento/module-tax-sample-data magento/module-catalog-rule-sample-data magento/module-configurable-sample-data magento/module-product-links-sample-data magento/module-sales-rule-sample-data magento/module-msrp-sample-data magento/module-grouped-product-sample-data magento/module-swatches-sample-data magento/module-offline-shipping-sample-data magento/sample-data-media --ignore-platform-reqs; fi && \
7575
if [ "${SAMPLE_DATA}" = "true" ]; then echo "[cad] Running setup:upgrade" && ./retry "php bin/magento setup:upgrade"; fi && \
76-
php bin/magento setup:static-content:deploy en_US -f -j 12 && \
7776
php bin/magento setup:di:compile && \
77+
php bin/magento setup:static-content:deploy en_US -f -j 12 && \
7878
php bin/magento indexer:reindex && \
7979
php scripts/apply-2.4-patches.php && \
8080
rm scripts/apply-2.4-patches.php && \

0 commit comments

Comments
 (0)