Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: workaround for incompatible compiler release binary #222

Merged
merged 7 commits into from
Apr 11, 2019
Merged

CI: workaround for incompatible compiler release binary #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d737257
ci: fix versions to workaround compiler release :bug:
bzz Apr 11, 2019
58a8169
ci: fix bug that enabled oniguruma for all profiles
bzz Apr 9, 2019
5fab94b
ci: disable cgo by default
bzz Apr 9, 2019
110822b
ci: remove 'sudo: false' as it's deprecated on Travis
bzz Apr 9, 2019
4147826
fix verb mismatch in a format string
bzz Apr 9, 2019
85de120
ci: export env vars
bzz Apr 11, 2019
85d5906
address review feedback - tixing a fypo
bzz Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
sudo: false
dist: trusty

language: go
go_import_path: gopkg.in/src-d/enry.v1

go:
- '1.11.x'
- '1.10.x'
- '1.11.6' # specific versions until https://github.com/golang/go/issues/31293
- '1.12.1'
bzz marked this conversation as resolved.
Show resolved Hide resolved
env:
global:
- GO_VERSION_FOR_JVM='1.11.x'
- GO_VERSION_FOR_JVM='1.11.1'
- CGO_ENABLED=0
matrix:
- ONIGURUMA=0
- ONIGURUMA=1
Expand All @@ -30,7 +30,12 @@ stages:

stage: test
install:
- if [[ -n "$ONIGURUMA" ]]; then tags="$tags oniguruma"; fi; go get -v -t --tags "$tags" ./...
- >
if [[ "${ONIGURUMA}" -gt 0 ]]; then
export tags="${tags} oniguruma";
export CGO_ENABLED=1;
fi;
- go get -v -t -tags "${tags}" ./...
script:
- make test-coverage
after_success:
Expand All @@ -43,6 +48,7 @@ jobs:
language: scala
jdk: oraclejdk8
before_install:
- export CGO_ENABLED=1
# mimics exact behavior of 'go_import_path' for non-go build image
- export GOPATH=${TRAVIS_HOME}/gopath
- mkdir -p ${GOPATH}/src/gopkg.in/src-d/enry.v1
Expand Down Expand Up @@ -122,6 +128,7 @@ jobs:
language: scala
jdk: oraclejdk8
before_install:
- export CGO_ENABLED=1
# mimics exact behavior of 'go_import_path' for non-go build image
- export GOPATH=${TRAVIS_HOME}/gopath
- mkdir -p ${GOPATH}/src/gopkg.in/src-d/enry.v1
Expand Down
2 changes: 1 addition & 1 deletion internal/code-generator/generator/heuristics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func loadHeuristics(yaml *Heuristics) (map[string][]*LanguagePattern, error) {
// unroll to a single map
for _, ext := range disambiguation.Extensions {
if _, ok := patterns[ext]; ok {
return nil, fmt.Errorf("cannt add extension '%s', it already exists for %q", ext, patterns[ext])
return nil, fmt.Errorf("cannot add extension '%s', it already exists for %+v", ext, patterns[ext])
}
patterns[ext] = rules
}
Expand Down