diff --git a/.github/workflows/store.yml b/.github/workflows/store.yml new file mode 100644 index 0000000..65653d0 --- /dev/null +++ b/.github/workflows/store.yml @@ -0,0 +1,71 @@ +name: StoreCheck +on: + push: + branches: + - master + tags: + - '*' + +env: + PLUGIN_NAME: ${{ github.event.repository.name }} + ACCOUNT_USER: ${{ secrets.ACCOUNT_USER }} + ACCOUNT_PASSWORD: ${{ secrets.ACCOUNT_PASSWORD }} + PLUGIN_UPLOADER_VERSION: 0.3.11 + +jobs: + validatePlugin: + if: startsWith(github.ref, 'refs/tags/') != true + name: Check for Store compliance + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2.3.1 + with: + path: ${{ env.PLUGIN_NAME }} + + - name: getPluginUploader + run: wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/${{ env.PLUGIN_UPLOADER_VERSION }}/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar + + - name: Build Zip + run: php frosh-plugin-upload.phar ext:zip ${PLUGIN_NAME} + + - name: Validate Zip + run: php frosh-plugin-upload.phar ext:validate $(pwd)/${PLUGIN_NAME}*.zip + + StoreUpdate: + needs: validatePlugin + name: Update Store page + if: startsWith(github.ref, 'refs/tags/') != true + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2.3.1 + with: + path: ${{ env.PLUGIN_NAME }} + + - name: getPluginUploader + run: wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/${{ env.PLUGIN_UPLOADER_VERSION }}/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar + + - name: StoreUpdate + run: php frosh-plugin-upload.phar ext:update $(pwd)/${{ env.PLUGIN_NAME }}/ + + StoreRelease: + if: startsWith(github.ref, 'refs/tags/') + runs-on: ubuntu-latest + name: Upload Extension to Store + steps: + - name: Checkout + uses: actions/checkout@v2.3.1 + with: + path: ${{ env.PLUGIN_NAME }} + + - name: Download Extension Uploader + run: wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/${{ env.PLUGIN_UPLOADER_VERSION }}/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar + + - name: Build Zip + run: php frosh-plugin-upload.phar ext:zip ${PLUGIN_NAME} + + - name: StoreUpload + run: php frosh-plugin-upload.phar ext:upload $(pwd)/${PLUGIN_NAME}*.zip --createRelease + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5fac6bd..0000000 --- a/.travis.yml +++ /dev/null @@ -1,79 +0,0 @@ -language: php - -php: - - 7.2 - -sudo: false - -services: - - mysql - -env: - matrix: - - SHOPWARE_VERSION="5.6" - global: - - PLUGIN_NAME=FroshTemplateMail - - SHOPWARE_DIRECTORY="${HOME}/shopware" - - PLUGIN_DIRECTORY="${SHOPWARE_DIRECTORY}/custom/plugins" - -stages: - - tests - - name: Store-Check - if: tag IS blank AND env(PLUGIN_ID) IS present AND type != pull_request - - name: Store-Sync - if: branch = master AND env(PLUGIN_ID) IS present AND type != pull_request - - name: Store-Deploy - if: tag IS present - - -cache: - directories: - - "${HOME}/.composer/cache/files" - -install: - - composer install - -before_script: - - if [[ "$(php --version | grep -cim1 xdebug)" -ge 1 ]]; then phpenv config-rm xdebug.ini; - fi - - git clone https://github.com/shopware/shopware.git ${SHOPWARE_DIRECTORY} --branch - ${SHOPWARE_VERSION} - - ant -f ${SHOPWARE_DIRECTORY}/build/build.xml -Dapp.host=localhost -Ddb.user=travis - -Ddb.host=127.0.0.1 -Ddb.name=shopware build-unit - - mv ${TRAVIS_BUILD_DIR} ${PLUGIN_DIRECTORY}/${PLUGIN_NAME} - - php ${HOME}/shopware/bin/console sw:plugin:refresh - - php ${HOME}/shopware/bin/console sw:plugin:install ${PLUGIN_NAME} - - php ${HOME}/shopware/bin/console sw:plugin:activate ${PLUGIN_NAME} - - cd ${PLUGIN_DIRECTORY}/${PLUGIN_NAME} - -after_success: - - ./build.sh $TRAVIS_TAG - -jobs: - include: - - stage: Store-Check - php: 7.3 - before_script: skip - install: - - ./build.sh "master" - - wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/0.2.1/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar - script: - - php frosh-plugin-upload.phar plugin:validate ${TRAVIS_BUILD_DIR}/${PLUGIN_NAME}*.zip - - stage: Store-Sync - before_script: skip - php: 7.3 - install: - - wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/0.2.1/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar - script: - - php frosh-plugin-upload.phar plugin:update ${TRAVIS_BUILD_DIR} - - stage: Store-Deploy - before_script: skip - php: 7.3 - install: - - wget 'https://github.com/FriendsOfShopware/FroshPluginUploader/releases/download/0.2.1/frosh-plugin-upload.phar' -O frosh-plugin-upload.phar - script: - - ./build.sh - - php frosh-plugin-upload.phar plugin:upload ${TRAVIS_BUILD_DIR}/${PLUGIN_NAME}*.zip - -script: - - composer test diff --git a/build.sh b/build.sh deleted file mode 100755 index 23db373..0000000 --- a/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -commit=$1 -if [ -z ${commit} ]; then - commit=$(git tag --sort=-creatordate | head -1) - if [ -z ${commit} ]; then - commit="master"; - fi -fi - -# Remove old release -rm -rf FroshTemplateMail FroshTemplateMail-*.zip - -# Build new release -mkdir -p FroshTemplateMail -git archive ${commit} | tar -x -C FroshTemplateMail -composer install --no-dev -n -o -d FroshTemplateMail -( find ./FroshTemplateMail -type d -name ".git" && find ./FroshTemplateMail -name ".gitignore" && find ./FroshTemplateMail -name ".gitmodules" ) | xargs rm -r -zip -r FroshTemplateMail-${commit}.zip FroshTemplateMail \ No newline at end of file diff --git a/composer.json b/composer.json index 144a5b4..46638d0 100644 --- a/composer.json +++ b/composer.json @@ -11,10 +11,10 @@ "installer-name": "FroshTemplateMail" }, "require": { - "php": "^7.0", + "php": "^7.2", "composer/installers": "~1.0" }, "scripts": { "test": "phpunit -c tests" } -} \ No newline at end of file +} diff --git a/plugin.xml b/plugin.xml index fc1fed9..d44e47e 100644 --- a/plugin.xml +++ b/plugin.xml @@ -3,7 +3,7 @@ xsi:noNamespaceSchemaLocation="../../../engine/Shopware/Components/Plugin/schema/plugin.xsd"> - 1.1.0 + 1.1.1 Friends of Shopware MIT https://github.com/FriendsOfShopware/FroshTemplateMail/ @@ -37,4 +37,9 @@ Shopware 5.6 Kompatiblität Shopware 5.6 Compability + + + Shopware 5.7 Kompatiblität + Shopware 5.7 Compability +