From 2df85b6f3384de7879f4535c3c1005d991e9e9a3 Mon Sep 17 00:00:00 2001 From: Shyim Date: Mon, 24 Jul 2023 22:34:04 +0200 Subject: [PATCH] fix: tag a new version --- .gitpod.Dockerfile | 5 --- .gitpod.yml | 91 ----------------------------------------- .shopware-extension.yml | 3 ++ CHANGELOG_en-GB.md | 79 ----------------------------------- README.md | 2 - composer.json | 2 +- 6 files changed, 4 insertions(+), 178 deletions(-) delete mode 100644 .gitpod.Dockerfile delete mode 100644 .gitpod.yml delete mode 100644 CHANGELOG_en-GB.md diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile deleted file mode 100644 index 4b009a6..0000000 --- a/.gitpod.Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM gitpod/workspace-full:latest - -RUN sudo apt-get update && \ - sudo apt-get install -y php8.1-fpm rsync && \ - brew install symfony-cli/tap/symfony-cli FriendsOfShopware/tap/shopware-cli \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 16e53b4..0000000 --- a/.gitpod.yml +++ /dev/null @@ -1,91 +0,0 @@ -image: - file: .gitpod.Dockerfile - -tasks: - - name: Shopware - before: | - echo 'alias admin-watch="LOAD_DOTENV=0 APP_URL=http://localhost:8000 ./bin/watch-administration.sh"' >> ~/.bashrc - init: | - EXTENSION_NAME=$(basename $PWD) - TMP_DIR=$(mktemp -d) - - mv * .* "$TMP_DIR" || true - - # Run MySQL - docker run --restart always -d --name=mysql -p 127.0.0.1:3306:3306 -e MYSQL_ROOT_PASSWORD=root mysql:8 - docker run --restart always -d --name=adminer --link mysql:mysql -p 5000:8080 -e ADMINER_DESIGN=pepa-linha -e ADMINER_DEFAULT_SERVER=mysql -e ADMINER_PLUGINS="tables-filter table-structure json-column version-noverify" ghcr.io/shyim/shopware-docker/adminer - - # Configure Github Token. Needed for Symfony Flex - sudo chown -R gitpod:gitpod /home/gitpod/.config/composer - composer config --global github-oauth.github.com $(printf '%s\n' host=github.com | gp credential-helper get | sort | head -2 | tail -1 | sed 's;password=;;') - - composer create-project shopware/production:dev-flex . -n - composer req --dev profiler fakerphp/faker mbezhanov/faker-provider-collection maltyxx/images-generator - - # PHP Settings - echo "memory_limit=512M" > php.ini - echo "assert.active=0" >> php.ini - echo "opcache.interned_strings_buffer=20" >> php.ini - echo "zend.detect_unicode=0" >> php.ini - echo "realpath_cache_ttl=3600" >> php.ini - # Configure Shopware - sed -i -e 's;DATABASE_URL=.*$;DATABASE_URL=mysql://root:root@127.0.0.1:3306/shopware;' .env - sed -i -e "s;APP_URL=.*$;APP_URL=$(gp url 8000);" .env - echo "TRUSTED_PROXIES=192.168.0.0/16" >> .env - - ./bin/console system:install --basic-setup --create-database --drop-database - - ./bin/console framework:demodata --products 300 - ./bin/console dal:refresh:index - rm -rf var/cache/* - # Set by default to dev - sed -i -e "s;APP_ENV=.*$;APP_URL=dev;" .env - - # Move actual repository - mv "$TMP_DIR" "custom/plugins/$EXTENSION_NAME" - command: docker ps && sleep 2 && ./bin/console sales-channel:update:domain $(gp url 8000 | awk -F[/:] '{print $4}') && symfony server:start --port 8000 -d - -ports: - - port: 8000 - visibility: private - description: Shopware - onOpen: open-browser - - port: 5000 - visibility: private - description: Adminer - onOpen: notify - - name: Admin-Watcher - port: 8080 - onOpen: notify - description: "Use Forward Proxy to localhost to access this service" - -jetbrains: - plugins: - - com.jetbrains.php - - com.intellij.php.tools.quality.phpstan - - com.intellij.php.psalm - - org.jetbrains.plugins.yaml - - com.jetbrains.twig - - de.espend.idea.php.annotation - - fr.adrienbrault.idea.symfony2plugin - - de.shyim.shopware6 - - de.shyim.ideaphpstantoolbox - phpstorm: - vmoptions: "-Xmx4g" - prebuilds: - version: stable - -vscode: - extensions: - - bmewburn.vscode-intelephense-client - - redhat.vscode-yaml - -github: - prebuilds: - master: true - branches: true - pullRequests: true - pullRequestsFromForks: true - addCheck: false - addComment: false - addBadge: true diff --git a/.shopware-extension.yml b/.shopware-extension.yml index 7aba21a..cddce5c 100644 --- a/.shopware-extension.yml +++ b/.shopware-extension.yml @@ -1,3 +1,6 @@ +changelog: + enabled: true + build: zip: composer: diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md deleted file mode 100644 index 28c678d..0000000 --- a/CHANGELOG_en-GB.md +++ /dev/null @@ -1,79 +0,0 @@ -# 2.0.1 - -* Fix mail template module in administration in production mode - -# 2.0.0 - -- Shopware 6.5 compatibility - -# 1.0.0 - -* Removed subscriber generator and use shopware core event - -# 0.4.5 - -* Added command to export all templates to folder -* Changed the template directories to use first the active theme - -# 0.4.4 - -* Update dependency - -# 0.4.3 - -* Add support for `mj_include`, thanks to @memoworker -* Improved mjml error handling, thanks to @memoworker - -# 0.4.2 - -* Compatibility 6.4.6.0 - -# 0.4.1 - -* Solved Composer InstalledVersions problem - -# 0.4.0 - -* Compatibility with 6.3 and 6.4 - -# 0.3.4 - -* Compatibility 6.3.5.0 - -# 0.3.3 - -* Compatibility 6.3.4.0 - -# 0.3.2 - -* Compatibility 6.3.3.0 - -# 0.3.1 - -* Compatibility 6.3.3.0 - -# 0.3.0 - -* Compatibility 6.3.3.0 - -# 0.2.1 - -* Language codes in template path instead of Ids now possible -* Twig files can now be included -* Corrected text blocks when the mail is sent from the admin - -# 0.2.0 - -* Compatibility mit 6.3 - -# 0.1.2 - -* Compatibility mit 6.2 - -# 0.1.1 - -* Fixed fatal error in plugin - -# 0.1.0 - -* First release in Store diff --git a/README.md b/README.md index fa641d2..dbcce0d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Store Shopware mail templates in theme -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/FriendsOfShopware/FroshPlatformTemplateMail) - [![codecov](https://codecov.io/gh/FriendsOfShopware/FroshPlatformTemplateMail/branch/master/graph/badge.svg?token=HUPWYZ80YS)](https://codecov.io/gh/FriendsOfShopware/FroshPlatformTemplateMail) [![PHPUnit](https://github.com/FriendsOfShopware/FroshPlatformTemplateMail/actions/workflows/unit.yml/badge.svg)](https://github.com/FriendsOfShopware/FroshPlatformTemplateMail/actions/workflows/unit.yml) [![Slack](https://img.shields.io/badge/chat-on%20slack-%23ECB22E)](https://slack.shopware.com?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) diff --git a/composer.json b/composer.json index b7a7a2d..e8b5366 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "frosh/frosh-platform-template-mail", - "version": "2.0.1", + "version": "2.0.2", "type": "shopware-platform-plugin", "description": "Load mail templates from theme", "keywords": [