From 064035f1d8a83bee2954689c6deec94d210c7bf6 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Thu, 30 Aug 2018 19:52:29 -0400 Subject: [PATCH] s3 finally working --- .gitignore | 3 +-- .travis.yml | 14 +++++++------- Makefile | 8 ++++++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 94e9a20..50d7e04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /vendor -/blobs /config.json* -/prism-bin +/bin diff --git a/.travis.yml b/.travis.yml index ab638c2..2153602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ script: # Fail if a .go file hasn't been formatted with gofmt - test -z $(gofmt -s -l $GO_FILES) # Run unit tests - - go test ./... + - make test # Checks for unused vars and fields on structs - varcheck ./... - structcheck ./... @@ -74,7 +74,7 @@ script: deploy: - provider: releases - file: prism-bin + file: ./bin/prism-bin skip_cleanup: true on: repo: lbryio/reflector.go @@ -83,14 +83,14 @@ deploy: api_key: secure: epAlhp3SUr8hhISarJ22n6tRw2TEa4s4oNFIvJUb5HGECVp1SYN7ao0ln5NoNLmfJS60pi911i/kMhhi21/uhZ0kCYlEhhIE2pc1zsiAxK9L9ENCssJ205HfVbe5grhwskLGzgjhU9OznO8WtmyOPWXr0it8M8RCTjx6rEC0A33Id3WMYyhP938Sj9CxEYeH4KS8wFvBXkgBVtrgaYwRTCIROFddHFXOb9jyNhqQ1RbfKtllsVtQhVk5WMlomheBNSS4vr6WMS4X4+2okFqnLtiSn1wrn5I/94UQbnrI1juVnQj0K+j32EyQbAOt4T2cLW3GtG0jhaYKyNMT9ycDCdVACPSDELlHWjeyoes9bnhUFftm6kDbQxwA1UsTF1yG8tMKXxBSmYyoT7qDloi6pBifZMrFXL61uTs6yhVB9LS/2oqg4sc0Ne87bRcn4OxsBeVCe3kbBHDTR/NTyF2gNPtRvgMAWULxTVcUm9VYdO0IWvAig5g4Row0DnFzEquD6CzezbRWD9WyZyV/AFyYHeeQ2PO7jTw0/3M7aDX33Fuhh34lehzmrC03cfgD/wZW+spxozIcQCYdiJqVw+u+/NvbNr0kkFzE9zW26JEmUFTyDvKxvnza1Kwtww3EgH6zaOL8r4yVbb54rePRvLw7pl93zlfJnEB2MCPqJOY5ZpU= - provider: s3 + local_dir: ./bin + skip_cleanup: true + on: + repo: lbryio/reflector.go + condition: "$DEPLOY = true" access_key_id: secure: "ABmoSTxTee1GubJmmi+MlyBcnqRT0ywEOtTL4hrH7T+Vj5UPcNBhjqGRiMXzO3MdrVWom19OnqMvsvAdehrB4uQJVlX/+zB26gTpEiiU5dWJgerNAYmfxDGNz/p9pyYWLvVY/cymSlJ4HkggJVg+dMTBTOP+gTNgQUhHL7pAd/Z5HMPmPW/rlNlQgDdczoY44OdiniuHny4Lr7mo8dcT4dcyJysPpHLCPGWp3kXcffIEbgO02aQZ14BbX9oU9xm1BacYnr4t8gRCU+uK0mt7TREHUzZ8bQBRXUymmpeeEQshXdifdwtk6sdRGIZiTi0NmQ7kYter6oh6623TH6rpNy/lkxKi823FbSPC1XZGH7CwcbnSIEwY++7e9PT0EA14VuDUF7+iXC/gpRkVQwUoMcoC9rHBjkXW+SiwHWoUeDKXrfVO9QGEJTi5bDRNwklwu2zkYWeRIPzfDaVayUBYwjunjT1eST997ygmJwJTJ6DeOWLx+WFlmwBJfQpBwbrlMrceiNjreMwGB6ffXEBzuM6S5inXGIChllGDpNyJeFVcH9zPpU0JsIpWoRjwLNFOiEhFsnzK5rvA2SKmlOOnSlgOCBQnFi2SmLDM790KoY8qjan2s984chQz2qsKnhYuVpJhG6LKgrI1QwE0KHr80spVFfewq11AU4Q+lfA9aAQ=" secret_access_key: secure: "AxYRTy/GnjeTJKQdeJ/AEeAd+yXs783bFDKdyKNswtsHlU8sWPQgNcvTLpVqnSQMpiwkGDGi/70rvR5C+AT3SIWNw13RYrgBRpduQU0J+B2JS+3dN2DIePu25uvs++Wo22OfS8I+UjZ1mWY1SSHI2spPXvDCq5tb+Ih8nlYflEyAtxU9Oq2R3Kus2tkIlRnL25sP/2fY7RvuJFYIV63z8ZIJRzB5WzOeERqnXq2zfwos+hycAqyo/VevJnWAYTEDsvBuSODOpZF+QfKtIQ2rYSoqy8Lq1M6UOZimnC3Ulea4euBVf2ssBCnI7csGNG5UzkTiwrPDi2xIP8nM01rHW1yHJ7tQsJaghnUsfw2t6ui4ZofvbbOFTN/YCloHITifEi8Tc1/17isi3y+kX5yQ/Nk5UNry0Wbt91CP+nkL/ZmA5grkBXDL7VJMmB60TnO3ap24CtwBQartN3LoWs7h+4ov+LqbCt6IqpJVWQWlwJeb2MFPFByALtBpsqAyL1SxXlGNpPa94CuXxfQ6Bv436PtefA5FlTzR8uMmqsjWciv06bVnSvVlFEVovN2Fkplrjt7AASJ/8KJs4THDg4k61nfd8roAHx6ewQzl4wCWKCikQ0MuFd2mVHwdrbnCH1mIHuPRyvWMMIAK0ooc1/rmKiJlpgumjxoFYNE10MXtt+I=" bucket: "lbry-reflector-binary" - skip_cleanup: true # local_dir: ./bin - file: prism-bin - on: - repo: lbryio/reflector.go - condition: "$DEPLOY = true" diff --git a/Makefile b/Makefile index bea3a21..9b2a44b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ BINARY=prism-bin DIR = $(shell cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) +BIN_DIR = ${DIR}/bin VENDOR_DIR = vendor IMPORT_PATH = github.com/lbryio/reflector.go @@ -8,12 +9,12 @@ VERSION = $(shell git --git-dir=${DIR}/.git describe --dirty --always --long --a LDFLAGS = -ldflags "-X ${IMPORT_PATH}/meta.Version=${VERSION} -X ${IMPORT_PATH}/meta.Time=$(shell date +%s)" -.PHONY: build dep clean test +.PHONY: build dep clean test lint .DEFAULT_GOAL: build build: dep - CGO_ENABLED=0 go build ${LDFLAGS} -asmflags -trimpath=${DIR} -o ${DIR}/${BINARY} main.go + mkdir -p ${BIN_DIR} && CGO_ENABLED=0 go build ${LDFLAGS} -asmflags -trimpath=${DIR} -o ${BIN_DIR}/${BINARY} main.go dep: | $(VENDOR_DIR) @@ -25,3 +26,6 @@ clean: test: go test ./... -v -cover + +lint: + go get github.com/alecthomas/gometalinter && gometalinter --install && gometalinter ./... \ No newline at end of file