simplify travis and makefile

composer · Oct 26, 2016 · fb49df7 · fb49df7
1 parent 3f750bc
commit fb49df7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ sudo: required
 services:
   - docker
 
-script:
-  - make
+before_script:
+  - make build
 
-notifications:
-  email: false
+script:
+  - make test
diff --git a/Makefile b/Makefile
@@ -1,17 +1,11 @@
 .PHONY = all build test
 
 all: build test
-
-build: build/1.1.3 build/1.2.1 build/snapshot
-test: test/1.1.3 test/1.2.1 test/snapshot
+build: build/1.1 build/1.2
+test: test/1.1 test/1.2
 
 build/%:
 	docker build -t "composer:$*" "$*"
 
 test/%:
 	docker run "composer:$*"
-
-tpl/%:
-	mkdir "$*"
-	cp Dockerfile.template "$*/Dockerfile"
-	sed -ri 's/%%COMPOSER_VERSION%%/'"$*"'/' "$*/Dockerfile"