Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADS-4478 Fix installation and bump PHP version #33

Merged
merged 11 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/action/setup_runner/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
php-version:
description: 'PHP version for PHP setup'
required: true
default: '8.1'
default: '8.2'

runs:
using: 'composite'
Expand All @@ -25,7 +25,7 @@ runs:

- uses: actions/setup-node@v4
with:
node-version: 18.18.0 # Last version with npm 9 (Shopware requirement)
node-version: 20

- name: Install Shopware-CLI
shell: bash
Expand Down
6 changes: 6 additions & 0 deletions .github/action/setup_shop/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ runs:
shell: bash
run: shopware-cli project create shopware ${{ inputs.shopware-version }}

- name: Set minimum stability to dev
shell: bash
run: |
cd shopware
composer config minimum-stability dev

- name: Install Shopware
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup Shopware Shop
uses: ./nosto-shopware6/.github/action/setup_shop
with:
shopware-version: '6.5.7.3'
shopware-version: '6.6.0.2'

- name: Install administration dependencies
run: |
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
PLUGIN_NAME: NostoIntegration
PLUGIN_MIN_REQUIREMENT: ~6.5.4
PLUGIN_MIN_REQUIREMENT: ~6.6.0
SHOPWARE_CLI_ACCOUNT_EMAIL: ${{ secrets.ACCOUNT_USER }}
SHOPWARE_CLI_ACCOUNT_PASSWORD: ${{ secrets.ACCOUNT_PASSWORD }}
SHOPWARE_CLI_COMPANY_ID: ${{ secrets.ACCOUNT_COMPANY_ID }}
Expand All @@ -27,8 +27,6 @@ jobs:

- name: Setup Plugin
uses: ./nosto-shopware6/.github/action/setup_plugin
with:
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Set minimum requirement
working-directory: nosto-shopware6
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/test-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: [ '8.1', '8.2' ]
php-versions: [ '8.2', '8.3' ]
shopware-versions: [
'6.5.4.1',
'6.5.5.2',
'6.5.6.1',
'6.5.7.3',
'6.6.0.2',
]

name: Shopware ${{ matrix.shopware-versions }} Test (PHP ${{ matrix.php-versions }})
Expand Down
12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
}
],
"require": {
"nosto/shopware6-job-scheduler": "^2.0.7",
"nosto/shopware6-job-scheduler": "dev-SW_6.6_update",
"nosto/php-sdk": "^7.2.1",
"php": "^8.1"
"php": "^8.2"
},
"require-dev": {
"symplify/easy-coding-standard": "^12.0",
"monolog/monolog": "^3.5",
"bramus/monolog-colored-line-formatter": "^3.1"
"bramus/monolog-colored-line-formatter": "^3.1",
"slevomat/coding-standard": "^8.15"
},
"autoload": {
"psr-4": {
Expand All @@ -32,10 +33,11 @@
},
"config": {
"platform": {
"php": "8.1"
"php": "8.2"
},
"allow-plugins": {
"symfony/runtime": true
"symfony/runtime": true,
"dealerdirect/phpcodesniffer-composer-installer": false
}
},
"extra": {
Expand Down
Loading