From 0bb3943698356dd4a12c082bdcab5c6031d91d6d Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 30 Jan 2015 11:49:52 -0600 Subject: [PATCH 1/3] Updated for Qt5.4 --- Dockerfile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94a8f098f5..771d197462 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,39 +3,38 @@ FROM ubuntu:14.04 ## Environment setup ENV HOME /root ENV GOPATH /root/go -ENV PATH /go/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +ENV PATH /golang/bin:/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games +ENV PKG_CONFIG_PATH /opt/qt54/lib/pkgconfig RUN mkdir -p /root/go ENV DEBIAN_FRONTEND noninteractive ## Install base dependencies RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev +RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev mesa-common-dev libglu1-mesa-dev -## Build and install Go +## Install Qt5.4 dependencies from PPA +RUN add-apt-repository ppa:beineri/opt-qt54-trusty -y +RUN apt-get update -y +RUN apt-get install -y qt54quickcontrols qt54webengine + +## Build and install latest Go RUN git clone https://go.googlesource.com/go golang RUN cd golang && git checkout go1.4.1 RUN cd golang/src && ./all.bash && go version -## Install GUI dependencies -RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y -RUN apt-get update -y -RUN apt-get install -y qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev - -## Fetch and install serpent-go -RUN go get -v -d github.com/ethereum/serpent-go -WORKDIR $GOPATH/src/github.com/ethereum/serpent-go -# RUN git checkout master -RUN git submodule update --init +## Fetch and install QML +RUN go get -u -v -d github.com/obscuren/qml +WORKDIR $GOPATH/src/github.com/obscuren/qml +RUN git checkout v1 RUN go install -v -# Fetch and install go-ethereum -RUN go get -v -d github.com/ethereum/go-ethereum/... +## Fetch and install go-ethereum +RUN go get -u -v -d github.com/ethereum/go-ethereum/... WORKDIR $GOPATH/src/github.com/ethereum/go-ethereum -# RUN git checkout develop RUN ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi RUN go install -v ./cmd/ethereum -# Run JSON RPC +## Run & expose JSON RPC ENTRYPOINT ["ethereum", "-rpc=true", "-rpcport=8080"] EXPOSE 8080 From 56a0131778df9e6f857001e3774fce4a6ef02b99 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 30 Jan 2015 17:24:51 -0600 Subject: [PATCH 2/3] Travis fixes for Qt5.4 --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6911eec844..1b15e1763e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,16 @@ language: go go: - tip before_install: - - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y + - sudo add-apt-repository ppa:beineri/opt-qt54 -y - sudo apt-get update -qq - - sudo apt-get install -yqq libgmp3-dev qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev libreadline6-dev + - sudo apt-get install -yqq libgmp3-dev libreadline6-dev qt54quickcontrols qt54webengine install: - go get code.google.com/p/go.tools/cmd/goimports - go get github.com/golang/lint/golint # - go get golang.org/x/tools/cmd/vet - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - go get github.com/mattn/goveralls - - go get gopkg.in/qml.v1 + - go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi before_script: - gofmt -l -w . @@ -22,5 +22,8 @@ before_script: script: - ./gocoverage.sh env: - - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64=" + global: + - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig + - LD_LIBRARY_PATH=/opt/qt54/lib + - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64=" From bd64ed1e9376e5c0fe167e8bb3f8c5f7c9126199 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 30 Jan 2015 18:47:25 -0600 Subject: [PATCH 3/3] Update coveralls badge to develop branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1f8dc2030..9c83215d06 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Ethereum PoC-8 * [![Build Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20master%20branch)](http://build.ethdev.com:8010/builders/Linux%20Go%20master%20branch/builds/-1) master * [![Build Status](http://build.ethdev.com/buildstatusimage?builder=Linux%20Go%20develop%20branch)](http://build.ethdev.com:8010/builders/Linux%20Go%20develop%20branch/builds/-1) develop * [![Travis-ci](https://api.travis-ci.org/ethereum/go-ethereum.svg)](https://travis-ci.org/ethereum/go-ethereum) travis-ci -* [![Coverage Status](https://coveralls.io/repos/ethereum/go-ethereum/badge.png?branch=tests)](https://coveralls.io/r/ethereum/go-ethereum?branch=tests) +* [![Coverage Status](https://coveralls.io/repos/ethereum/go-ethereum/badge.png?branch=develop)](https://coveralls.io/r/ethereum/go-ethereum?branch=develop) Ethereum Go Client © 2014 Jeffrey Wilcke.