whatwg · annevk · Jan 15, 2017 · Jan 15, 2017 · Jan 23, 2017 · Jan 23, 2017
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 1
+indent_style = space
+trim_trailing_whitespace = true
+max_line_length = 100
+
+[Makefile]
+indent_style = tab
+
+[.travis.yml]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+*    text=auto eol=lf
+*.bs diff=html linguist-language=HTML
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 deploy_key
 deploy_key.pub
 url.html
+deploy.sh
diff --git a/.travis.yml b/.travis.yml
@@ -2,16 +2,12 @@ language: generic
 
 env:
   global:
-    - ENCRYPTION_LABEL: "82f6fcb5a224"
-addons:
-  apt:
-    packages:
-      - oracle-java8-set-default
-install:
-  - curl -O https://sideshowbarker.net/nightlies/jar/vnu.jar
+    - ENCRYPTION_LABEL="82f6fcb5a224"
+    - DEPLOY_USER="annevankesteren"
+
 script:
-  - bash ./deploy.sh
-  - /usr/lib/jvm/java-8-oracle/jre/bin/java -jar vnu.jar --skip-non-html /home/travis/build/whatwg/url
+  - curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
+
 notifications:
   email:
     on_success: never

diff --git a/Makefile b/Makefile
@@ -3,3 +3,6 @@ local: url.bs
 
 remote: url.bs
 	curl https://api.csswg.org/bikeshed/ -f -F [email protected] > url.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
+
+deploy: url.bs
+	curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh --local
diff --git a/README.md b/README.md
@@ -27,10 +27,7 @@ If you want to preview the spec locally, you can either use a locally installed
 running `make remote`.
 
 If you want to do a complete "local deploy" including commit and/or branch snapshots, run
-
-```
-./deploy.sh --local
-```
+`make deploy`.
 
 ### Merge policy
 

diff --git a/deploy.sh b/deploy.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* text=auto eol=lf
Copy link Member Author annevk Jan 24, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Per feedback the eol=lf is redundant.
		*.bs diff=html linguist-language=HTML