From 517c7ee1a3e0f858e67bb0a798377afd8e2e4078 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Tue, 18 Nov 2014 13:34:26 -0700 Subject: [PATCH] Makefile cleanup - Remove unused clean task + Add ci task + Add build and test tasks to .PHONY Part of #3 --- Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 5a4ebd467a..810beb5883 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,11 @@ NAME := selenium VERSION := $(or $(VERSION),$(VERSION),'2.44.0') PLATFORM := $(shell uname -s) -ifeq ($(PLATFORM), Darwin) -COPYARGS := -pR -else -COPYARGS := -rT -endif +all: hub chrome firefox -all: hub chrome firefox test +build: all -build: all clean +ci: build test base: cd ./Base && docker build -t $(NAME)/base:$(VERSION) . @@ -47,9 +43,7 @@ release: tag_latest docker push $(NAME)/node-firefox @echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)" -clean: - test: ./test.sh -.PHONY: all base hub nodebase chrome firefox full tag_latest release clean +.PHONY: all base hub nodebase chrome firefox full tag_latest release build test