ralsina/tartrazine
1
0
Fork 0
mirror of https://github.com/ralsina/tartrazine.git synced 2025-08-02 22:09:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #222 from bzz/ci-workaround

Browse Source 
CI: workaround for incompatible compiler release binary
This commit is contained in:
Alexander
2019-04-11 23:02:24 +02:00
committed by GitHub
parent 59289bd4f5 85d5906b2b
commit 8c5e0ceaca
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.travis.yml
View File

@@ -1,15 +1,15 @@
sudo: false
dist: trusty dist: trusty
language: go language: go
go_import_path: gopkg.in/src-d/enry.v1 go_import_path: gopkg.in/src-d/enry.v1
go: go:
- '1.11.x' - '1.11.6' # specific versions until https://github.com/golang/go/issues/31293
- '1.10.x' - '1.12.1'
env: env:
global: global:
- GO_VERSION_FOR_JVM='1.11.x' - GO_VERSION_FOR_JVM='1.11.1'
- CGO_ENABLED=0
matrix: matrix:
- ONIGURUMA=0 - ONIGURUMA=0
- ONIGURUMA=1 - ONIGURUMA=1
@@ -30,7 +30,12 @@ stages:
stage: test stage: test
install: 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: script:
- make test-coverage - make test-coverage
after_success: after_success:
@@ -43,6 +48,7 @@ jobs:
language: scala language: scala
jdk: oraclejdk8 jdk: oraclejdk8
before_install: before_install:
- export CGO_ENABLED=1
# mimics exact behavior of 'go_import_path' for non-go build image # mimics exact behavior of 'go_import_path' for non-go build image
- export GOPATH=${TRAVIS_HOME}/gopath - export GOPATH=${TRAVIS_HOME}/gopath
- mkdir -p ${GOPATH}/src/gopkg.in/src-d/enry.v1 - mkdir -p ${GOPATH}/src/gopkg.in/src-d/enry.v1
@@ -122,6 +128,7 @@ jobs:
language: scala language: scala
jdk: oraclejdk8 jdk: oraclejdk8
before_install: before_install:
- export CGO_ENABLED=1
# mimics exact behavior of 'go_import_path' for non-go build image # mimics exact behavior of 'go_import_path' for non-go build image
- export GOPATH=${TRAVIS_HOME}/gopath - export GOPATH=${TRAVIS_HOME}/gopath
- mkdir -p ${GOPATH}/src/gopkg.in/src-d/enry.v1 - mkdir -p ${GOPATH}/src/gopkg.in/src-d/enry.v1

2
internal/code-generator/generator/heuristics.go
View File

@@ -51,7 +51,7 @@ func loadHeuristics(yaml *Heuristics) (map[string][]*LanguagePattern, error) {
// unroll to a single map // unroll to a single map
for _, ext := range disambiguation.Extensions { for _, ext := range disambiguation.Extensions {
if _, ok := patterns[ext]; ok { 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 patterns[ext] = rules
} }