Skip to content
Snippets Groups Projects
Unverified Commit 588f47d4 authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Add CI step to verify merged vendor js

parent eda98ed3
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
#!/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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment