Skip to content

Commit

Permalink
Merge pull request #13 from SwedbankPay/feature/magento-requirements
Browse files Browse the repository at this point in the history
Updates Magento Framework requirements for M2.4 in composer.json file
  • Loading branch information
shahriar-vdc authored Feb 10, 2021
2 parents 347bfe2 + 8f4602b commit 3964ceb
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 24 deletions.
40 changes: 18 additions & 22 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
run: git fetch --prune --unshallow

- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.2
uses: gittools/actions/gitversion/setup@v0.9.7
with:
versionSpec: '5.2.x'
versionSpec: '5.x'

- name: Execute GitVersion
id: gitversion # step id used as reference for output values
uses: gittools/actions/gitversion/execute@v0.9.2
uses: gittools/actions/gitversion/execute@v0.9.7

- name: PHP Setup
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -106,26 +106,22 @@ jobs:
- name: PHPUnit
run: ./vendor/bin/phpunit ./Test/Unit

- name: Create Release
id: create_release
uses: actions/create-release@v1
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Pre-release
uses: marvinpinto/action-automatic-releases@latest
if: startsWith(github.ref, 'refs/heads/master')
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
repo_token: ${{ secrets.GITHUB_TOKEN }}
automatic_release_tag: latest
prerelease: true
title: Development Build
files: ${{ steps.archive.outputs.name }}

- name: Upload to stable release
uses: svenstaro/upload-release-action@v1-release
if: startsWith(github.ref, 'refs/tags/')
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ${{ steps.archive.outputs.name }}
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ steps.archive.outputs.name }}
asset_name: ${{ steps.archive.outputs.name }}
asset_content_type: application/zip
tag: ${{ github.ref }}
overwrite: true
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
],
"keywords": ["magento", "payment", "swedbank-pay"],
"require": {
"magento/framework": "^100.1||^101.0||^102.0",
"magento/framework": "^100.1||^101.0||^102.0||^103.0",
"magento/module-checkout": "^100.0",
"swedbank-pay/magento2-core": "^1.3",
"swedbank-pay/magento2-core": "^1.4",
"ext-json": "*",
"ext-curl": "*"
},
Expand Down

0 comments on commit 3964ceb

Please sign in to comment.