From 588f47d498e78b027fd635ebfaa47876ec8e21b7 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 10 Mar 2017 10:45:27 +0100
Subject: [PATCH] Add CI step to verify merged vendor js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
.drone.yml | 8 ++++++++
build/mergejschecker.sh | 25 +++++++++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100755 build/mergejschecker.sh
diff --git a/.drone.yml b/.drone.yml
index 5d4ab2ca963..5cfba60cd45 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,6 +19,13 @@ pipeline:
when:
matrix:
TESTS: check-autoloader
+ check-mergejs:
+ image: nextcloudci/php7.0:php7.0-7
+ commands:
+ - bash ./build/mergejschecker.sh
+ when:
+ matrix:
+ TESTS: check-mergejs
app-check-code:
image: nextcloudci/php7.0:php7.0-7
commands:
@@ -493,6 +500,7 @@ matrix:
- TESTS: integration-ldap-features
- TESTS: jsunit
- TESTS: check-autoloader
+ - TESTS: check-mergejs
- TESTS: app-check-code
- TESTS: syntax-php5.6
- TESTS: syntax-php7.0
diff --git a/build/mergejschecker.sh b/build/mergejschecker.sh
new file mode 100755
index 00000000000..aee2629956b
--- /dev/null
+++ b/build/mergejschecker.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+#Regenerate the vendors core.js
+echo
+echo "Regenerating core/vendor/core.js"
+
+d=`dirname $(readlink -f $0)`
+
+php $d/mergejs.php
+
+files=`git diff --name-only`
+
+for file in $files
+do
+ if [[ $file == core/vendor/core.js ]]
+ then
+ echo "The merged vendor file is not up to date"
+ echo "Please run: php build/mergejs.php"
+ echo "And commit the result"
+ break
+ fi
+done
+
+echo "Vendor js merged as expected. Carry on"
+exit 0
--
GitLab