Skip to content

Commit

Permalink
Merge pull request #18 from shopware/20241209-1017-patch
Browse files Browse the repository at this point in the history
fix: copy assets after all JS building stages have been executed
  • Loading branch information
philipreinken authored Dec 17, 2024
2 parents 620f202 + 1da5cfc commit 5292076
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ inputs:
shopware-version:
description: "Shopware Version to use"
required: true
default: "v6.5.7.4"
default: "v6.6.8.0"
shopware-repository:
description: The shopware repository to checkout
required: true
default: shopware/shopware
php-version:
description: "PHP Version to use"
required: true
default: "8.2"
default: "8.3"
php-extensions:
description: "PHP extensions to install"
required: true
default: ""
default: "gd, xml, dom, curl, pdo, mysqli, mbstring, pdo_mysql, bcmath, pcov, zip"
composer-root-version:
description: "The COMPOSER_ROOT_VERSION that should be set"
required: false
Expand Down Expand Up @@ -280,7 +280,6 @@ runs:
working-directory: ${{ inputs.path }}
run: |
composer run build:js:admin
bin/console assets:install
- name: Build JS Storefront
if: inputs.install-storefront == 'true'
Expand All @@ -289,12 +288,19 @@ runs:
run: |
composer run build:js:storefront
- name: Copy assets
if: inputs.install-storefront == 'true' || inputs.install-admin == 'true'
shell: bash
working-directory: ${{ inputs.path }}
run: |
bin/console assets:install
- name: Assign default Storefront theme to all sales channels
if: inputs.install-storefront == 'true'
shell: bash
working-directory: ${{ inputs.path }}
run: |
if bin/console theme:change --help | grep -q '--sync'; then
if bin/console theme:change --help | egrep -q '^\s+--sync'; then
bin/console theme:change --sync --all Storefront
else
bin/console theme:change --all Storefront
Expand Down

0 comments on commit 5292076

Please sign in to comment.