From 2ffd99e1f9956db75b1fab837db2c7e69e8e35d0 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 21 Feb 2016 10:38:54 +0100 Subject: [PATCH 1/6] Added all task as first task to makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 569960d..44a34d3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: clean deps fmt vet test docker +.PHONY: all clean deps fmt vet test docker EXECUTABLE ?= drone-s3-sync IMAGE ?= plugins/$(EXECUTABLE) @@ -7,6 +7,8 @@ CI_BUILD_NUMBER ?= 0 LDFLAGS = -X "main.buildDate=$(shell date -u '+%Y-%m-%d %H:%M:%S %Z')" PACKAGES = $(shell go list ./... | grep -v /vendor/) +all: deps build test + clean: go clean -i ./... From 89fcebf89a0740a8829495f1275ea92d1b773b56 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 21 Feb 2016 10:43:08 +0100 Subject: [PATCH 2/6] Removed unused CI_BUILD_NUMBER from makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 44a34d3..8bdae9c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ EXECUTABLE ?= drone-s3-sync IMAGE ?= plugins/$(EXECUTABLE) -CI_BUILD_NUMBER ?= 0 LDFLAGS = -X "main.buildDate=$(shell date -u '+%Y-%m-%d %H:%M:%S %Z')" PACKAGES = $(shell go list ./... | grep -v /vendor/) From 0be1d32b32e4e6b71eb869196a2c1dae39a5a82d Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 21 Feb 2016 11:06:41 +0100 Subject: [PATCH 3/6] Make the builds reproducable based on commit sha --- Makefile | 3 ++- main.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8bdae9c..08ec003 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,9 @@ EXECUTABLE ?= drone-s3-sync IMAGE ?= plugins/$(EXECUTABLE) +COMMIT ?= $(shell git rev-parse --short HEAD) -LDFLAGS = -X "main.buildDate=$(shell date -u '+%Y-%m-%d %H:%M:%S %Z')" +LDFLAGS = -X "main.buildCommit=$(COMMIT)" PACKAGES = $(shell go list ./... | grep -v /vendor/) all: deps build test diff --git a/main.go b/main.go index 862312b..b9469c0 100644 --- a/main.go +++ b/main.go @@ -24,11 +24,11 @@ type result struct { } var ( - buildDate string + buildCommit string ) func main() { - fmt.Printf("Drone S3 Sync Plugin built at %s\n", buildDate) + fmt.Printf("Drone S3 Sync Plugin built from %s\n", buildCommit) vargs := PluginArgs{} workspace := drone.Workspace{} From 499cd58e57c8d43a9fd9b3a5df29c3d6007b1d8c Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 21 Feb 2016 11:20:01 +0100 Subject: [PATCH 4/6] Updated maintainers file, added names and athieriot --- MAINTAINERS | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a63ad47..0ecaf19 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4,6 +4,8 @@ email = "brad@drone.io" login = "bradrydzewski" [people.Bugagazavr] + name = "Kirill" + email = "" login = "Bugagazavr" [people.donny-dont] name = "Don Olmstead" @@ -23,9 +25,22 @@ login = "nlf" [people.tboerger] name = "Thomas Boerger" - email = "" + email = "thomas@webhippie.de" login = "tboerger" + [people.athieriot] + name = "Aurélien Thieriot" + email = "a.thieriot@gmail.com" + login = "athieriot" [org] [org.core] - people = ["bradrydzewski", "Bugagazavr", "donny-dont", "jackspirou", "msteinert", "nlf", "tboerger"] + people = [ + "bradrydzewski", + "Bugagazavr", + "donny-dont", + "jackspirou", + "msteinert", + "nlf", + "tboerger", + "athieriot" + ] From 71a5d359ecc520f9051580880c74cd5829c85591 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 21 Feb 2016 11:38:18 +0100 Subject: [PATCH 5/6] Updated gitignore to respect also coverage.out --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ddde65e..f1c058d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,5 @@ _testmain.go *.test *.prof +coverage.out drone-s3-sync \ No newline at end of file From 47b9cc25cf8b0fa0c877dacefd22298ef47875dd Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sun, 21 Feb 2016 12:30:25 +0100 Subject: [PATCH 6/6] Reference to DOCS.md from README.md for usage information --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68f7687..2b80d9b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Coverage Status](https://aircover.co/badges/drone-plugins/drone-s3-sync/coverage.svg)](https://aircover.co/drone-plugins/drone-s3-sync) [![](https://badge.imagelayers.io/plugins/drone-s3-sync:latest.svg)](https://imagelayers.io/?images=plugins/drone-s3-sync:latest 'Get your own badge on imagelayers.io') -Drone plugin to synchronize a directory with an Amazon S3 Bucket +Drone plugin to synchronize a directory with an Amazon S3 Bucket. For the usage information and a listing of the available options please take a look at [the docs](DOCS.md). ## Binary