diff --git a/CHANGELOG.md b/CHANGELOG.md index ab49b1c..66e6f7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. --- ## Latest Release +### 1.6.5 +- fix an issue when reading `..theme/composer.json` to determine which Hyva version to use through composer.json +- add some GitHub Status-Badges to `README.md` ### 1.6.4 - updating wording - Thanks to @andreas-penner-basecom diff --git a/README.md b/README.md index d0ed506..935a440 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ -# [DDEV] Woodoo Frontend Buildtools for Magento & Hyvä +# [DDEV] Woodoo Frontend Buildtools for Magento & Hyvä -[![tests](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml/badge.svg)](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml) License Badge (MIT-License) Last commit date Badge +[![tests](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml/badge.svg)](https://github.com/dermatz/ddev-woodoo-buildtools-magento/actions/workflows/tests.yml) Dependencies Last commit date Badge Sponsors --- +https://img.shields.io/github/license/dermatz/ddev-woodoo-buildtools-magento + + This ddev add-on helps you to manage your theme build processes in Magento total easy. You can run a build command to build all your themes or a specific theme. Don't matter if the theme is a Magento Standard or Custom Theme, or maybe a Hyva theme. It automatically takes care which type of theme you use and will build it for you. If a dependency is missing, Woodoo will install it. _>> Build all your Magento themes at once, with Magic, build with Woodoo!_ diff --git a/commands/web/woodoo_components/build b/commands/web/woodoo_components/build index f87db32..ab239dd 100644 --- a/commands/web/woodoo_components/build +++ b/commands/web/woodoo_components/build @@ -74,7 +74,7 @@ function buildHyva() { HYVA_PATH=$1 HYVA_NAME=$2 - if [[ ! -f ${HYVA_PATH}composer.json ]]; then + if [[ ! -f "${DDEV_COMPOSER_ROOT}/${HYVA_PATH}/composer.json" ]]; then echo -e "${txtred}${ICON_ERROR} Could not find composer.json in Theme (${HYVA_PATH})" echo -e "${txtylw}${ICON_ARROW_RIGHT} Use composer.json from Magento-Root instead${txtrst}" cd "${DDEV_COMPOSER_ROOT}" || exit @@ -84,6 +84,7 @@ function buildHyva() { # trunk-ignore(shellcheck/SC2046) # trunk-ignore(shellcheck/SC2005) # trunk-ignore(shellcheck/SC2312) + cd "${DDEV_COMPOSER_ROOT}/${HYVA_PATH}" || exit hyva_version=$(echo $(grep -oP '(?<="hyva-themes/magento2-default-theme": ").*' composer.json) | cut -d ' ' -f 1 | sed 's/"//g') fi diff --git a/commands/web/woodoo_components/variables b/commands/web/woodoo_components/variables index 90a720a..0426070 100644 --- a/commands/web/woodoo_components/variables +++ b/commands/web/woodoo_components/variables @@ -1,6 +1,6 @@ #!/bin/bash #ddev-generated - Do not modify this file; your modifications will be overwritten. -WOODOO_VERSION="1.6.4" +WOODOO_VERSION="1.6.5" LATEST_WOODOO_VERSION=$(curl -s https://api.github.com/repos/dermatz/ddev-woodoo-buildtools-magento/releases/latest | grep tag_name | cut -d '"' -f 4) PROJECT_CONFIG_FILE=".ddev/config-themes.yaml"