Clean up Travis stuff MOAR

.travis.yml

@@ -8,9 +8,9 @@ install: npm install
 jobs:
   include:
     - stage: test
-      script: bash ./deploy/test.sh
-    - stage: build
-      script: bash ./deploy/deploy.sh
+      script: bash ./travis/test.sh
+    - stage: deploy
+      script: bash ./travis/deploy.sh
 env:
   global:
     - ENCRYPTION_LABEL: "af862fa96d3e"

travis/deploy.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 # Adapted from https://gist.github.com/domenic/ec8b0fc8ab45f39403dd.
-
 set -e
 
 # For revert branches, do nothing
@@ -47,7 +46,7 @@ ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
 ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
 ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
 ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy/deploy-key.enc -out deploy-key -d
+openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in travis/deploy-key.enc -out deploy-key -d
 chmod 600 deploy-key
 eval `ssh-agent -s`
 ssh-add deploy-key

travis/test.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 set -e
 
 # For revert branches, do nothing