Skip to content

Commit

Permalink
Merge pull request #222 from bzz/ci-workaround
Browse files Browse the repository at this point in the history
CI: workaround for incompatible compiler release binary
  • Loading branch information
bzz authored Apr 11, 2019
2 parents 59289bd + 85d5906 commit 8c5e0ce
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
17 changes: 12 additions & 5 deletions .travis.yml
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'
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
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

0 comments on commit 8c5e0ce

Please sign in to comment.