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.

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

>= go1.15.5 Linux & Darwin #1677

Merged
merged 4 commits into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ workflows:
jobs:
build-builder:
docker:
- image: circleci/golang:1-stretch
- image: circleci/golang:1.15.5
working_directory: /go/src/github.com/livepeer/go-livepeer

environment:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.13.x
- 1.15.x
os: osx
osx_image: xcode10.2
env:
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.build-linux
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
FROM ubuntu:16.04

ENV PATH "/usr/lib/go-1.13/bin:/go/bin:${PATH}"
ENV PATH "/usr/local/go/bin:/go/bin:${PATH}"
ENV PKG_CONFIG_PATH "/root/compiled/lib/pkgconfig"
ENV CPATH /usr/local/cuda/include
ENV LIBRARY_PATH /usr/local/cuda/lib64

RUN apt-get update \
&& apt-get install -y software-properties-common curl apt-transport-https \
&& add-apt-repository ppa:longsleep/golang-backports -y \
&& curl https://dl.google.com/go/go1.15.5.linux-amd64.tar.gz | tar -C /usr/local -xz \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
&& apt-key adv --keyserver keyserver.ubuntu.com --recv 15CF4D18AF4F7421 \
&& add-apt-repository "deb [arch=amd64] http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main" \
&& apt-get update \
&& apt-get -y install clang-8 clang-tools-8 build-essential pkg-config autoconf gnutls-dev golang-1.13-go sudo git python docker-ce-cli
&& apt-get -y install clang-8 clang-tools-8 build-essential pkg-config autoconf gnutls-dev sudo git python docker-ce-cli

RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 30 \
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 30
Expand Down
2 changes: 1 addition & 1 deletion server/cliserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func TestActivateOrchestrator(t *testing.T) {
body, err = ioutil.ReadAll(res.Body)
res.Body.Close()
require.Nil(err)
assert.Equal(strings.TrimSpace(string(body)), "parse hello world: invalid URI for request")
assert.Equal(strings.TrimSpace(string(body)), "parse \"hello world\": invalid URI for request")
form["serviceURI"] = []string{"http://foo.bar:1337"}

req = bytes.NewBufferString(form.Encode())
Expand Down