Skip to content

Commit

Permalink
Add travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuri Shkuro committed Oct 17, 2016
1 parent 9e8a1b9 commit 321ba1b
Show file tree
Hide file tree
Showing 10 changed files with 204 additions and 14 deletions.
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
sudo: required

services:
- docker

language: go

go:
- 1.6
- 1.7

env:
global:
- GO15VENDOREXPERIMENT=1

install:
- make install_ci

script:
- make test_ci
- travis_retry goveralls -coverprofile=cover.out -service=travis-ci || true
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ make test
## Making A Change

*Before making any significant changes, please [open an
issue](https://github.com/uber/jaeger-client-go/issues).* Discussing your proposed
issue](https://github.com/uber/jaeger-lib/issues).* Discussing your proposed
changes ahead of time will make the contribution process smooth for everyone.

Once we've discussed your changes and you've got your code ready, make sure
Expand All @@ -35,7 +35,7 @@ pull request is most likely to be accepted if it:
## License

By contributing your code, you agree to license your contribution under the terms
of the MIT License: https://github.com/uber/jaeger-client-go/blob/master/LICENSE
of the [MIT License](./LICENSE).

If you are adding a new file it should have a header like below.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ install_ci: install

.PHONY: test_ci
test_ci:
@./scripts/cover.sh $(shell go list $(PACKAGES))
./scripts/cover.sh $(shell go list $(PACKAGES))
make lint

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package: github.com/uber/jaeger
package: github.com/uber/jaeger-lib
import:
- package: github.com/codahale/hdrhistogram
10 changes: 0 additions & 10 deletions hello.go

This file was deleted.

10 changes: 10 additions & 0 deletions sample/sample.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package sample

import (
"fmt"
)

// SayHello is a sample function
func SayHello() {
fmt.Println("Hello, playground")
}
12 changes: 12 additions & 0 deletions sample/sample_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package sample

import "testing"

func ExampleSayHello() {
SayHello()
// Output: Hello, playground
}

func TestSayHello(t *testing.T) {
SayHello()
}
64 changes: 64 additions & 0 deletions scripts/cover.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
#!/bin/bash

set -e

COVER=.cover
ROOT_PKG=github.com/uber/jaeger-lib/

if [[ -d "$COVER" ]]; then
rm -rf "$COVER"
fi
mkdir -p "$COVER"

# If a package directory has a .nocover file, don't count it when calculating
# coverage.
filter=""
for pkg in "$@"; do
if [[ -f "$GOPATH/src/$pkg/.nocover" ]]; then
if [[ -n "$filter" ]]; then
filter="$filter, "
fi
filter="\"$pkg\": true"
fi
done

if [[ "$filter" = "" ]]; then
# make up some name to avoid breaking jq's select(in({}))
filter='"no-filter": true'
fi

i=0
for pkg in "$@"; do
i=$((i + 1))

extracoverpkg=""
if [[ -f "$GOPATH/src/$pkg/.extra-coverpkg" ]]; then
extracoverpkg=$( \
sed -e "s|^|$pkg/|g" < "$GOPATH/src/$pkg/.extra-coverpkg" \
| tr '\n' ',')
fi

coverpkg=$(go list -json "$pkg" | jq -r '
.Deps
| . + ["'"$pkg"'"]
| map
( select(startswith("'"$ROOT_PKG"'"))
| select(contains("/vendor/") | not)
| select(in({'"$filter"'}) | not)
)
| join(",")
')
if [[ -n "$extracoverpkg" ]]; then
coverpkg="$extracoverpkg$coverpkg"
fi

args=""
if [[ -n "$coverpkg" ]]; then
args="-coverprofile $COVER/cover.${i}.out" # -coverpkg $coverpkg"
fi

echo go test -v -race "$pkg"
go test $args -v -race "$pkg"
done

gocovmerge "$COVER"/*.out > cover.out
87 changes: 87 additions & 0 deletions scripts/updateLicense.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
from __future__ import (
absolute_import, print_function, division, unicode_literals
)

import re
import sys
from datetime import datetime

CURRENT_YEAR = datetime.today().year

LICENSE_BLOB = """Copyright (c) %d Uber Technologies, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.""" % CURRENT_YEAR

LICENSE_BLOB_LINES_GO = [
('// ' + l).strip() + '\n' for l in LICENSE_BLOB.split('\n')
]

COPYRIGHT_RE = re.compile(r'Copyright \(c\) (\d+)', re.I)


def update_go_license(name):
with open(name) as f:
orig_lines = list(f)
lines = list(orig_lines)

found = False
changed = False
for i, line in enumerate(lines[:5]):
m = COPYRIGHT_RE.search(line)
if not m:
continue

found = True
year = int(m.group(1))
if year == CURRENT_YEAR:
break

new_line = COPYRIGHT_RE.sub('Copyright (c) %d' % CURRENT_YEAR, line)
assert line != new_line, ('Could not change year in: %s' % line)
lines[i] = new_line
changed = True
break

if not found:
if 'Code generated by' in lines[0]:
lines[1:1] = ['\n'] + LICENSE_BLOB_LINES_GO
else:
lines[0:0] = LICENSE_BLOB_LINES_GO + ['\n']
changed = True

if changed:
with open(name, 'w') as f:
for line in lines:
f.write(line)


def main():
if len(sys.argv) == 1:
print('USAGE: %s FILE ...' % sys.argv[0])
sys.exit(1)

for name in sys.argv[1:]:
if name.endswith('.go'):
update_go_license(name)
else:
raise NotImplementedError('Unsupported file type: %s' % name)


if __name__ == "__main__":
main()
6 changes: 6 additions & 0 deletions scripts/updateLicenses.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

set -e
set -x

python scripts/updateLicense.py $(go list -json $(glide nv) | jq -r '.Dir + "/" + (.GoFiles | .[])')

0 comments on commit 321ba1b

Please sign in to comment.