Skip to content

Commit

Permalink
Merge pull request #371 from Adyen/develop
Browse files Browse the repository at this point in the history
Release 3.11.0
  • Loading branch information
peterojo authored Apr 17, 2023
2 parents f7d633d + 2e69609 commit 36c4bbd
Show file tree
Hide file tree
Showing 42 changed files with 749 additions and 14,151 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
name: E2E Test
run-name: Headless E2E tests for Adyen Shopware Plugin

on: [pull_request]
on:
pull_request:
workflow_dispatch:

jobs:
e2e:
name: Shopware 6 E2E
runs-on: ubuntu-latest
runs-on:
group: larger-runners
labels: ubuntu-latest-8-cores
timeout-minutes: 20
strategy:
fail-fast: false
Expand Down Expand Up @@ -41,6 +45,9 @@ jobs:
docker exec shopware6 bash -c 'php bin/console system:config:set AdyenPaymentShopware6.config.apiKeyTest "${{secrets.ADYEN_API_KEY}}"'
docker exec shopware6 bash -c 'php bin/console system:config:set AdyenPaymentShopware6.config.merchantAccount "${{secrets.ADYEN_MERCHANT}}"'
docker exec shopware6 bash -c 'php bin/console system:config:set AdyenPaymentShopware6.config.clientKeyTest "${{secrets.ADYEN_CLIENT_KEY}}"'
docker exec shopware6 bash -c 'php bin/console system:config:set AdyenPaymentShopware6.config.adyenGivingCharityMerchantAccount "${{secrets.DONATION_ACCOUNT}}"'
docker exec shopware6 bash -c 'php bin/console system:config:set AdyenPaymentShopware6.config.adyenGivingEnabled true'
docker exec shopware6 bash -c 'php bin/console system:config:set AdyenPaymentShopware6.config.adyenGivingDonationAmounts "1,5,10"'
docker exec shopware6 bash -c 'php bin/console adyen:payment-method:enable --all'
docker exec shopware6 bash -c 'php bin/console adyen:fetch-logos'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/templates/docker-compose.playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ services:
environment:
- INTEGRATION_TESTS_BRANCH
- SHOPWARE_BASE_URL
- PAYPAL_USERNAME
- PAYPAL_PASSWORD
volumes:
- ../scripts/e2e.sh:/e2e.sh
- ../../../test-report:/tmp/test-report
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
],
"description": "Official Shopware 6 Plugin to connect to Payment Service Provider Adyen",
"version": "3.10.1",
"version": "3.11.0",
"type": "shopware-platform-plugin",
"license": "MIT",
"require": {
Expand Down
Loading

0 comments on commit 36c4bbd

Please sign in to comment.