From 689f8eadc80b6af4369c29aff12032c83133753a Mon Sep 17 00:00:00 2001 From: Julien Loizelet Date: Thu, 4 Jan 2024 17:06:03 +0900 Subject: [PATCH] fix(cache): Add crowdsec/magento-symfony-cache possible dependency to avoid composer conflicts (#6) --- .github/workflows/keepalive.yml | 26 +++++++++++++++++++++++++ .github/workflows/static-test-suite.yml | 2 ++ CHANGELOG.md | 11 +++++++++++ composer.json | 6 +++--- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/keepalive.yml diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml new file mode 100644 index 0000000..c98254c --- /dev/null +++ b/.github/workflows/keepalive.yml @@ -0,0 +1,26 @@ +name: Keep Alive +on: + + schedule: + - cron: '0 3 * * 4' + +permissions: + contents: write + +jobs: + keep-alive: + + name: Keep Alive + runs-on: ubuntu-latest + + steps: + + - name: Clone project files + uses: actions/checkout@v3 + + # keepalive-workflow adds a dummy commit if there's no other action here, keeps + # GitHub from turning off tests after 60 days + - uses: gautamkrishnar/keepalive-workflow@v1 + with: + commit_message: "chore(*): Automated commit to keep the repository active" + time_elapsed: 50 diff --git a/.github/workflows/static-test-suite.yml b/.github/workflows/static-test-suite.yml index 2065f7c..ee2612f 100644 --- a/.github/workflows/static-test-suite.yml +++ b/.github/workflows/static-test-suite.yml @@ -5,6 +5,8 @@ on: - main paths-ignore: - '**.md' + schedule: + - cron: '25 02 * * THU' workflow_dispatch: permissions: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ccd162..c31ce8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 --- +## [1.0.1](https://github.com/crowdsecurity/magento-cs-extension/releases/tag/v1.0.1) - 2024-01-04 +[_Compare with previous release_](https://github.com/crowdsecurity/magento-cs-extension/compare/v1.0.0...v1.0.1) + + +### Fixed + +- Allow `crowdsec/symfony-cache:3.0.0` dependency to avoid composer conflict with some Magento 2.4.6 patch versions + +--- + + ## [1.0.0](https://github.com/crowdsecurity/magento-cs-extension/releases/tag/v1.0.0) - 2023-08-22 [_Compare with previous release_](https://github.com/crowdsecurity/magento-cs-extension/compare/v0.3.0...v1.0.0) diff --git a/composer.json b/composer.json index ecd093a..2a42f68 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "crowdsec/magento2-module-engine", "description": "This Magento 2 module allows sharing threat signal and benefit from the CrowdSec's community blocklist.", "type": "magento2-module", - "version": "1.0.0", + "version": "1.0.1", "minimum-stability": "stable", "license": "MIT", "authors": [ @@ -30,8 +30,8 @@ "community" ], "require": { - "crowdsec/remediation-engine": "^3.2", - "crowdsec/magento-symfony-cache": "1.1.0 || 2.2.0" + "crowdsec/remediation-engine": "^3.3", + "crowdsec/magento-symfony-cache": "1.1.0 || 2.2.0 || 3.0.0" }, "autoload": { "files": [