diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 05cc46261b6631f65c0d7c4f493645a038a97a69..0000000000000000000000000000000000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,39 +0,0 @@ -# --- -# -*- coding: utf-8 -*- -# -# Master Module for Magento 2 (mastermoduleformagento2) is a master -# Copyright (C) 2021 Nicolas Béjean -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -stages: - - deploy - -ssh:deploy: - stage: deploy - tags: - - magento2 - - ssh - only: - refs: - - master - script: - - cd /var/www/html/m24-1/app/code/NicolasBejean/Master - - git fetch origin - - git checkout master - - git pull - - cd /var/www/html/m24-1/ - - bin/magento setup:upgrade - - bin/magento setup:di:compile - - bin/magento cache:clean diff --git a/CHANGELOG.md b/CHANGELOG.md index e11f2412a12fcb6a7427cc262aa72e8461d7b028..1386815e0b76ee0c59957a3c0e8650e0e2c3fe21 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.2.6] - 2023-09-30 +### Changed +- Delete .gitlab-ci.yml file +- Update README.md +- Update composer.json +- Update module.xml + ## [1.1.6] - 2021-03-13 ### Fixed - Fixed Composer Installation Command in README.md diff --git a/composer.json b/composer.json index fccffb3088109a41e8e6ee69df884c158bf35fcb..c6731360458aa761e02804e587f7a7fe43311128 100755 --- a/composer.json +++ b/composer.json @@ -2,10 +2,10 @@ "name": "nicolasbejean/module-master", "description": "Base de travail pour le développement d'un module Magento 2", "type": "magento2-module", - "version": "1.1.6", + "version": "1.2.6", "require": { - "php": ">=7.3", - "magento/framework": ">=102" + "php": "~8.1.0||~8.2.0", + "magento/framework": "103.0.*" }, "license": [ "GPL-3.0-only" diff --git a/etc/module.xml b/etc/module.xml index 5f01ad773a97437df7b0fdc68fd68da0fc83c19c..2b129fa302578c43ff01805dfcc1e47bc0e7c89e 100755 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,8 +1,4 @@ <?xml version="1.0"?> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> - <module name="NicolasBejean_Master" setup_version="1.1.6"> - <sequence> - <module name="NicolasBejean_Base"/> - </sequence> - </module> + <module name="NicolasBejean_Master"/> </config>