darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated Makefile to create packaging/output during build step

Browse source
This commit is contained in:
Brad Rydzewski 2014-10-16 20:40:26 -07:00
parent 6ca9ca7c09
commit e49b81e7a4
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -20,6 +20,7 @@ test_postgres:
TEST_DRIVER="postgres" TEST_DATASOURCE="host=127.0.0.1 user=postgres dbname=postgres sslmode=disable" go test -short github.com/drone/drone/server/datastore/database TEST_DRIVER="postgres" TEST_DATASOURCE="host=127.0.0.1 user=postgres dbname=postgres sslmode=disable" go test -short github.com/drone/drone/server/datastore/database
build: build:
mkdir -p packaging/output
mkdir -p packaging/root/usr/local/bin mkdir -p packaging/root/usr/local/bin
go build -o packaging/root/usr/local/bin/drone -ldflags "-X main.revision $(SHA)" github.com/drone/drone/cli go build -o packaging/root/usr/local/bin/drone -ldflags "-X main.revision $(SHA)" github.com/drone/drone/cli
go build -o packaging/root/usr/local/bin/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server go build -o packaging/root/usr/local/bin/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server
@ -36,7 +37,6 @@ clean:
rm -rf packaging/output rm -rf packaging/output
rm -f packaging/root/usr/local/bin/drone rm -f packaging/root/usr/local/bin/drone
rm -f packaging/root/usr/local/bin/droned rm -f packaging/root/usr/local/bin/droned
mkdir -p packaging/output
lessc: lessc:
lessc --clean-css server/app/styles/drone.less server/app/styles/drone.css lessc --clean-css server/app/styles/drone.less server/app/styles/drone.css

1
server/session/session.go
View file

@ -66,7 +66,6 @@ func getUserBearer(c context.Context, r *http.Request) *model.User {
return []byte(*secret), nil return []byte(*secret), nil
}) })
if err != nil || !token.Valid { if err != nil || !token.Valid {
println("invalid token")
return nil return nil
} }
var userid, ok = token.Claims["user_id"].(float64) var userid, ok = token.Claims["user_id"].(float64)