From 077a3fb600c27182192d1b75f5e958ac17743198 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Mon, 13 Aug 2018 22:12:38 +0200 Subject: [PATCH 1/8] drone rips 4.0-dev --- .drone.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.drone.yml b/.drone.yml index 1e9fbf609c5d6..512f9f1ed5c88 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,6 +58,15 @@ pipeline: - fluxbox > /dev/null 2>&1 & - node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run + analysis: + image: rips/rips-cli + secrets: [rips_username, rips_password] + commands: + - export RIPS_BASE_URI='https://api.rips.joomla.org' + - export RIPS_USERNAME=$RIPS_USERNAME + - export RIPS_PASSWORD=$RIPS_PASSWORD + - rips-cli rips:scan:start -a 2 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; } + system-tests: image: joomlaprojects/docker-systemtests:develop commands: From 81a9f0a2b507b12b490b31405162e9c066d55bc9 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Tue, 14 Aug 2018 21:46:41 +0200 Subject: [PATCH 2/8] Update .drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 614cdcf0e2172..a01a95943997b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -68,7 +68,7 @@ pipeline: analysis: image: rips/rips-cli - secrets: [rips_username, rips_password] + secrets: [rips_username, rips_password] commands: - export RIPS_BASE_URI='https://api.rips.joomla.org' - export RIPS_USERNAME=$RIPS_USERNAME From 38198efda2799bc9de992ca90e2a6a1842fb80f2 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 26 Aug 2018 14:36:54 +0200 Subject: [PATCH 3/8] chage app id --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 614cdcf0e2172..1197b4b3ef594 100644 --- a/.drone.yml +++ b/.drone.yml @@ -73,7 +73,7 @@ pipeline: - export RIPS_BASE_URI='https://api.rips.joomla.org' - export RIPS_USERNAME=$RIPS_USERNAME - export RIPS_PASSWORD=$RIPS_PASSWORD - - rips-cli rips:scan:start -a 2 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; } + - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; } system-tests: image: joomlaprojects/docker-systemtests:develop From 759eb639f796f44d2e2954f6b77fc60d200a9bc6 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 26 Aug 2018 14:49:52 +0200 Subject: [PATCH 4/8] drone --- modules/mod_stats/Helper/StatsHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mod_stats/Helper/StatsHelper.php b/modules/mod_stats/Helper/StatsHelper.php index 13fe0f4dcfcdf..e8ff75a804639 100644 --- a/modules/mod_stats/Helper/StatsHelper.php +++ b/modules/mod_stats/Helper/StatsHelper.php @@ -96,7 +96,7 @@ public static function &getList(&$params) ->from($db->quoteName('#__content', 'c')) ->leftJoin( $db->quoteName('#__workflow_stages', 'ws') - . ' ON ' . $db->quoteName('ws.id') . ' = ' . $db->quoteName('c.state') + . ' ON ' . $db->quoteName('ws.id') . ' = ' . $db->quoteName('c.state') ) ->where($db->quoteName('ws.condition') . ' = 1'); $db->setQuery($query); From 57bf53c495a60c403eeb13c2d8950fe3ebe3fb88 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 26 Aug 2018 15:12:38 +0200 Subject: [PATCH 5/8] change --- modules/mod_stats/mod_stats.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mod_stats/mod_stats.php b/modules/mod_stats/mod_stats.php index fbaac9566efe5..d9af60108391c 100644 --- a/modules/mod_stats/mod_stats.php +++ b/modules/mod_stats/mod_stats.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -use Joomla\CMS\Helper\ModuleHelper; +use Joomla\CMS\Helper\ModuleHelper; use Joomla\Module\Stats\Site\Helper\StatsHelper; $serverinfo = $params->get('serverinfo'); From 8087de2a51c42bb0bde8519448889b1826dacedf Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 26 Aug 2018 15:38:32 +0200 Subject: [PATCH 6/8] make sure an copied repo don't run into issues --- .drone.yml | 2 ++ modules/mod_stats/mod_stats.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8e04b9d7c2895..1d36c7b24ad72 100644 --- a/.drone.yml +++ b/.drone.yml @@ -73,6 +73,8 @@ pipeline: - export RIPS_BASE_URI='https://api.rips.joomla.org' - export RIPS_USERNAME=$RIPS_USERNAME - export RIPS_PASSWORD=$RIPS_PASSWORD + - if [ -z $RIPS_USERNAME ]; then echo "The analysis check require username and passwords"; fi + - if [ -z $RIPS_USERNAME ]; then exit 0; fi - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; } system-tests: diff --git a/modules/mod_stats/mod_stats.php b/modules/mod_stats/mod_stats.php index d9af60108391c..fbaac9566efe5 100644 --- a/modules/mod_stats/mod_stats.php +++ b/modules/mod_stats/mod_stats.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -use Joomla\CMS\Helper\ModuleHelper; +use Joomla\CMS\Helper\ModuleHelper; use Joomla\Module\Stats\Site\Helper\StatsHelper; $serverinfo = $params->get('serverinfo'); From b3cd41417a61fd0ec3ce17c4a38fbf68e625f913 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 26 Aug 2018 16:54:01 +0200 Subject: [PATCH 7/8] move system tests step --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1d36c7b24ad72..d1e7183161916 100644 --- a/.drone.yml +++ b/.drone.yml @@ -66,6 +66,11 @@ pipeline: - fluxbox > /dev/null 2>&1 & - node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run + system-tests: + image: joomlaprojects/docker-systemtests:develop + commands: + - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)" + analysis: image: rips/rips-cli secrets: [rips_username, rips_password] @@ -77,11 +82,6 @@ pipeline: - if [ -z $RIPS_USERNAME ]; then exit 0; fi - rips-cli rips:scan:start -a 3 -t 1 -p $(pwd) -t 1 -T $DRONE_REPO_OWNER-$DRONE_BRANCH || { echo "Please contact the security team at security@joomla.org"; exit 1; } - system-tests: - image: joomlaprojects/docker-systemtests:develop - commands: - - bash libraries/vendor/joomla/test-system/src/drone-run.sh "$(pwd)" - services: mysql: image: mysql:5.7 From 6d96b3fee3cb92c5ae33388bb06e12f5d1011a69 Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 26 Aug 2018 17:19:32 +0200 Subject: [PATCH 8/8] break phpcs again --- modules/mod_stats/Helper/StatsHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mod_stats/Helper/StatsHelper.php b/modules/mod_stats/Helper/StatsHelper.php index e8ff75a804639..13fe0f4dcfcdf 100644 --- a/modules/mod_stats/Helper/StatsHelper.php +++ b/modules/mod_stats/Helper/StatsHelper.php @@ -96,7 +96,7 @@ public static function &getList(&$params) ->from($db->quoteName('#__content', 'c')) ->leftJoin( $db->quoteName('#__workflow_stages', 'ws') - . ' ON ' . $db->quoteName('ws.id') . ' = ' . $db->quoteName('c.state') + . ' ON ' . $db->quoteName('ws.id') . ' = ' . $db->quoteName('c.state') ) ->where($db->quoteName('ws.condition') . ' = 1'); $db->setQuery($query);