From f64c93d7c8c1b602b4bbd244f50183c901964640 Mon Sep 17 00:00:00 2001 From: Stephan Pohl Date: Thu, 9 May 2019 09:02:02 +0200 Subject: [PATCH 1/3] NTR - Force download of the chromedriver --- dev-ops/e2e/actions/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ops/e2e/actions/init.sh b/dev-ops/e2e/actions/init.sh index 658e72d4..1645917b 100644 --- a/dev-ops/e2e/actions/init.sh +++ b/dev-ops/e2e/actions/init.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash #DESCRIPTION: installs the dependencies for the e2e tests using npm -CHROMEDRIVER_VERSION=LATEST npm clean-install --prefix vendor/shopware/platform/src/Administration/Resources/e2e/ +CHROMEDRIVER_VERSION=LATEST CHROMEDRIVER_FORCE_DOWNLOAD=true npm clean-install --prefix vendor/shopware/platform/src/Administration/Resources/e2e/ From 7df9d30711705f339eaa1105e26aa7d01f7db69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bu=CC=88cker?= Date: Mon, 13 May 2019 09:23:47 +0200 Subject: [PATCH 2/3] Require 6.0-dp --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bc18cec5..e4a4dcff 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ }, "require": { "ocramius/package-versions": "1.4.0", - "shopware/platform": "dev-master" + "shopware/platform": "dev-6.0-dp" }, "scripts": { "post-update-cmd": [ From bb76ea9316ae449493ce2c8338796ac76f329193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bu=CC=88cker?= Date: Mon, 13 May 2019 14:14:26 +0200 Subject: [PATCH 3/3] Revert "Merge pull request #269 in NEXT/development from ntr/require-6.0-dp to 6.0-dp" This reverts commit 6e69b3682a7cd7b40485b5fd027471861460e224, reversing changes made to 2d37b3fe4d4d3ad2dda801c341024d80ca09fa43. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e4a4dcff..bc18cec5 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ }, "require": { "ocramius/package-versions": "1.4.0", - "shopware/platform": "dev-6.0-dp" + "shopware/platform": "dev-master" }, "scripts": { "post-update-cmd": [