Skip to content

Commit 6b88225

Browse files
author
Denys Smirnov
committed
update sdk and enable language aliases; fixes bblfsh#39
Signed-off-by: Denys Smirnov <[email protected]>
1 parent 71ccd1d commit 6b88225

File tree

6 files changed

+100
-47
lines changed

6 files changed

+100
-47
lines changed

Diff for: ‎Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ RUN gradle shadowJar
3030
# Stage 1.1: Native Driver Tests
3131
#================================
3232
FROM native as native_test
33+
3334
# run native driver tests
3435
RUN gradle test --info --stacktrace
3536

3637

3738
#=================================
3839
# Stage 2: Go Driver Server Build
3940
#=================================
40-
FROM golang:1.10-alpine as driver
41+
FROM golang:1.12-alpine as driver
4142

4243
ENV DRIVER_REPO=github.com/bblfsh/bash-driver
4344
ENV DRIVER_REPO_PATH=/go/src/$DRIVER_REPO
@@ -50,6 +51,9 @@ WORKDIR $DRIVER_REPO_PATH/
5051

5152
ENV GO111MODULE=on GOFLAGS=-mod=vendor
5253

54+
# workaround for https://github.com/golang/go/issues/28065
55+
ENV CGO_ENABLED=0
56+
5357
# build server binary
5458
RUN go build -o /tmp/driver ./driver/main.go
5559
# build tests

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Bash driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/bash-driver.svg?branch=master)](https://travis-ci.org/bblfsh/bash-driver) ![Native Version](https://img.shields.io/badge/bash%20version-8.131.11--r2-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.12-63afbf.svg)
1+
# Bash driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/bash-driver.svg?branch=master)](https://travis-ci.org/bblfsh/bash-driver) ![Native Version](https://img.shields.io/badge/bash%20version-8-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.12-63afbf.svg)
22

33
bash driver for [babelfish](https://github.com/bblfsh/bblfshd).
44

Diff for: ‎build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
sdk: '2'
22
language: bash
33
go-runtime:
4-
version: '1.10-alpine'
4+
version: '1.12-alpine'
55
native:
66
image: 'openjdk:8-jre-alpine'
77
static:

Diff for: ‎go.mod

+23-11
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,32 @@ module github.com/bblfsh/bash-driver
33
go 1.12
44

55
require (
6-
github.com/BurntSushi/toml v0.3.1 // indirect
76
github.com/Microsoft/go-winio v0.4.12 // indirect
8-
github.com/bblfsh/sdk/v3 v3.0.0
9-
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
10-
github.com/gogo/protobuf v1.2.0 // indirect
11-
github.com/mattn/go-isatty v0.0.4 // indirect
7+
github.com/bblfsh/sdk/v3 v3.1.0
8+
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
9+
github.com/docker/go-connections v0.4.0 // indirect
10+
github.com/docker/go-units v0.4.0 // indirect
11+
github.com/gogo/protobuf v1.2.1 // indirect
12+
github.com/google/go-cmp v0.3.0 // indirect
13+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
14+
github.com/mattn/go-colorable v0.1.2 // indirect
1215
github.com/opencontainers/runc v1.0.0-rc7 // indirect
16+
github.com/opentracing/opentracing-go v1.1.0 // indirect
17+
github.com/ory/dockertest v3.3.4+incompatible // indirect
1318
github.com/pkg/errors v0.8.1 // indirect
14-
github.com/sirupsen/logrus v1.3.0 // indirect
19+
github.com/sirupsen/logrus v1.4.2 // indirect
1520
github.com/stretchr/testify v1.3.0 // indirect
16-
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
17-
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3 // indirect
18-
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 // indirect
19-
google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922 // indirect
20-
google.golang.org/grpc v1.18.0 // indirect
21+
github.com/uber-go/atomic v1.4.0 // indirect
22+
github.com/uber/jaeger-client-go v2.16.0+incompatible // indirect
23+
github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
24+
go.uber.org/atomic v1.4.0 // indirect
25+
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
26+
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
27+
golang.org/x/sys v0.0.0-20190524152521-dbbf3f1254d4 // indirect
28+
golang.org/x/text v0.3.2 // indirect
29+
google.golang.org/appengine v1.4.0 // indirect
30+
google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 // indirect
31+
google.golang.org/grpc v1.21.0 // indirect
32+
gopkg.in/bblfsh/sdk.v1 v1.17.0 // indirect
2133
gopkg.in/yaml.v2 v2.2.2 // indirect
2234
)

0 commit comments

Comments
 (0)