updated Makefile to create packaging/output
during build step
This commit is contained in:
parent
6ca9ca7c09
commit
e49b81e7a4
2 changed files with 1 additions and 2 deletions
2
Makefile
2
Makefile
|
@ -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
|
||||
|
||||
build:
|
||||
mkdir -p packaging/output
|
||||
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/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server
|
||||
|
@ -36,7 +37,6 @@ clean:
|
|||
rm -rf packaging/output
|
||||
rm -f packaging/root/usr/local/bin/drone
|
||||
rm -f packaging/root/usr/local/bin/droned
|
||||
mkdir -p packaging/output
|
||||
|
||||
lessc:
|
||||
lessc --clean-css server/app/styles/drone.less server/app/styles/drone.css
|
||||
|
|
|
@ -66,7 +66,6 @@ func getUserBearer(c context.Context, r *http.Request) *model.User {
|
|||
return []byte(*secret), nil
|
||||
})
|
||||
if err != nil || !token.Valid {
|
||||
println("invalid token")
|
||||
return nil
|
||||
}
|
||||
var userid, ok = token.Claims["user_id"].(float64)
|
||||
|
|
Loading…
Reference in a new issue