diff --git a/.travis.yml b/.travis.yml index b858f7055..b981f047e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,17 @@ language: r matrix: include: - - name: "Doc check" + - name: "Roxygen check" r: release r_packages: - devtools - roxygen2 script: - ./tools/checkDocsCurrent.sh + - name: "Javascript check" + language: node_js + cache: yarn + script: ./tools/checkJSCurrent.sh - name: "Old Release Check" r: oldrel - name: "Current Release Check" diff --git a/tools/checkDocsCurrent.sh b/tools/checkDocsCurrent.sh index b10cd980f..6d42068d1 100755 --- a/tools/checkDocsCurrent.sh +++ b/tools/checkDocsCurrent.sh @@ -2,6 +2,11 @@ # Generate package docs in the working directory Rscript -e "devtools::document(roclets=c('rd', 'collate', 'namespace'))" +if [ $? -ne 0 ] +then + echo "Error generating Roxygen docs." + exit 1 +fi # This command will return a zero exit code if there are uncommitted changes test -n "$(git status --porcelain)" diff --git a/tools/checkJSCurrent.sh b/tools/checkJSCurrent.sh new file mode 100755 index 000000000..85993d837 --- /dev/null +++ b/tools/checkJSCurrent.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# Run JS build process +(cd "$(dirname "$0")" && yarn build) +if [ $? -ne 0 ] +then + echo "Error generating JavaScript assets with yarn." + exit 1 +fi + +# This command will return a zero exit code if there are uncommitted changes +test -n "$(git status --porcelain)" +if [ $? -eq 0 ] +then + git status --porcelain + echo "Please rebuild the JavaScript and commit the changes." + echo "The above files changed when we built the JavaScript assets. This most often occurs when a user makes changes to the JavaScript sources but doesn't rebuild and commit them." + exit 1 +else + echo "No difference detected; JavaScript build is current." +fi