From 1e1a548459b54b0a52fa82aa65d0b2b4a6d04709 Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@albinlarsson.com>
Date: Tue, 10 Jul 2018 02:44:15 +0200
Subject: [PATCH 1/3] Simplify travis conf

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d2722414..29a6dfc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
-node_js:
-  - 'lts/*'
+node_js: lts/*
 
 script:
-  - npm run lint
-  - npm run build
+- npm run lint
+- npm run build

From 6fd4389887d2546c9763f9c8577feea5db7d78f7 Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@albinlarsson.com>
Date: Tue, 10 Jul 2018 03:38:20 +0200
Subject: [PATCH 2/3] Add travis check for omitting dist in development branch

---
 .travis.yml          | 1 +
 .travis/omit-dist.sh | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100755 .travis/omit-dist.sh

diff --git a/.travis.yml b/.travis.yml
index 29a6dfc9..fa259abb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,6 @@ language: node_js
 node_js: lts/*
 
 script:
+- bash .travis/omit-dist.sh
 - npm run lint
 - npm run build
diff --git a/.travis/omit-dist.sh b/.travis/omit-dist.sh
new file mode 100755
index 00000000..f107a6b9
--- /dev/null
+++ b/.travis/omit-dist.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ $TRAVIS_BRANCH == "develop" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qE "^(demo/)?dist/"); then
+	echo 'Build output ("dist" and "demo/dist") not permitted in develop' >&2
+	exit 1
+fi

From 82a119c67fd9c287fefb49a2c80a48692d4f7fbb Mon Sep 17 00:00:00 2001
From: Albin Larsson <mail@albinlarsson.com>
Date: Tue, 10 Jul 2018 03:52:02 +0200
Subject: [PATCH 3/3] Add travis check for the base branch (only permit develop
 for code changes)

---
 .travis.yml                    | 1 +
 .travis/prevent-base-master.sh | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100755 .travis/prevent-base-master.sh

diff --git a/.travis.yml b/.travis.yml
index fa259abb..3203fb95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: node_js
 node_js: lts/*
 
 script:
+- bash .travis/prevent-base-master.sh
 - bash .travis/omit-dist.sh
 - npm run lint
 - npm run build
diff --git a/.travis/prevent-base-master.sh b/.travis/prevent-base-master.sh
new file mode 100755
index 00000000..54536a66
--- /dev/null
+++ b/.travis/prevent-base-master.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $TRAVIS_BRANCH == "master" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q "^src/"); then
+	echo 'The base branch for pull requests must be "develop"' >&2
+	exit 1
+fi