Merge pull request #85 from simelo/stdevHan_t75_circle_deploy

Fixes #75 Circle CI deploy in 0.25.1

.circleci/config.yml

@@ -59,20 +59,23 @@ jobs:
   publish-github-release_32:
     docker:
       - image: docker:18.06.0-ce-git
+    working_directory: $GOPATH/src/github.com/skycoin/libskycoin
+    environment:
+      TAG_DEPLOY: $(git tag -l --points-at HEAD)
     steps:
       - run: mkdir -p $GOPATH/src/github.com/ $GOPATH/src/github.com/skycoin
+      - run: if [[ $TAG_DEPLOY ]]; then echo $TAG_DEPLOY ; fi
       - checkout
       - setup_remote_docker:
           version: 18.06.0-ce
-      - run: if [[ $CIRCLE_TAG ]]; then   docker build  --build-arg SHA1=$CIRCLE_SHA1 --build-arg GITHUB_OAUTH_TOKEN --build-arg PROJECT_USERNAME=$CIRCLE_PROJECT_USERNAME --build-arg PROJECT_REPONAME=$CIRCLE_PROJECT_REPONAME --build-arg QEMU_PLATFORM=raspberrypi3 --build-arg VERSION  --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/deploy-arm/Dockerfile  $GOPATH/src/github.com/skycoin/libskycoin -t skydev-deploy ; fi
-
+      - run: if [[ $TAG_DEPLOY ]]; then docker build  --build-arg SHA1=$CIRCLE_SHA1 --build-arg GITHUB_OAUTH_TOKEN --build-arg PROJECT_USERNAME=$CIRCLE_PROJECT_USERNAME --build-arg PROJECT_REPONAME=$CIRCLE_PROJECT_REPONAME --build-arg QEMU_PLATFORM=raspberrypi3 --build-arg VERSION  --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/deploy-arm/Dockerfile  $GOPATH/src/github.com/skycoin/libskycoin -t skydev-deploy ; fi
 
 workflows:
   version: 2
   arm_test:
     jobs:
-      - raspberrypi3
-      - orangepi-plus2
-      - raspberrypi2
       - bananapi_m1_plus
+      - raspberrypi2
+      - raspberrypi3
+      - orangepi-plus2      
       - publish-github-release_32

ci-scripts/docker_install_debian.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 apt-get update
-apt-get install gcc-6 g++-6 curl wget -y
+apt-get install gcc-6 g++-6 curl wget cmake libcurl3-gnutls -y
+
+sudo apt-get remove curl -y
+(cd deps && wget http://curl.haxx.se/download/curl-7.58.0.tar.gz && tar -xvf curl-7.58.0.tar.gz && cd curl-7.58.0/ && ./configure && make && sudo make install)
+(cd deps && git clone https://github.com/uncrustify/uncrustify.git && cd uncrustify && mkdir build && cd build && cmake .. && make && sudo make install)
 
 wget -c https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz
 tar -xzf check-0.12.0.tar.gz

ci-scripts/docker_install_ubuntu.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 apt-get update
-apt-get install gcc-6 g++-6 curl wget -y
+apt-get install gcc-6 g++-6 curl wget cmake libcurl3-gnutls -y
+
+sudo apt-get remove curl -y
+(cd deps && wget http://curl.haxx.se/download/curl-7.58.0.tar.gz && tar -xvf curl-7.58.0.tar.gz && cd curl-7.58.0/ && ./configure && make && sudo make install)
+(cd deps && git clone https://github.com/uncrustify/uncrustify.git && cd uncrustify && mkdir build && cd build && cmake .. && make && sudo make install)
 
 wget -c https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz
 tar -xzf check-0.12.0.tar.gz

docker/images/deploy-arm/Dockerfile

@@ -15,12 +15,12 @@ RUN make -C $GOPATH/src/github.com/skycoin/libskycoin dep
 RUN go get github.com/gz-c/gox
 RUN go get -t ./...
 ENV CGO_ENABLED=1
-RUN export VERSION="$(git describe --tags --exact-match HEAD 2> /dev/null)"
+RUN export VERSION="$(git tag -l --points-at HEAD)"
 RUN export ARCH="$(uname -m)"
 RUN export OS="$(uname -s)"
 RUN make -C $GOPATH/src/github.com/skycoin/libskycoin build
-RUN tar -c -z -f libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz -C $GOPATH/src/github.com/skycoin/libskycoin/build $GOPATH/src/github.com/skycoin/libskycoin/build/*
+RUN tar -czf libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz -C $GOPATH/src/github.com/skycoin/libskycoin/build $GOPATH/src/github.com/skycoin/libskycoin/build/*
 RUN go get github.com/tcnksm/ghr
 RUN ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} -delete ${VERSION} libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz
 
-RUN [ "cross-build-end" ]
+RUN [ "cross-build-end" ]

docker/images/test-arm/Dockerfile

@@ -21,4 +21,4 @@ RUN make -C $GOPATH/src/github.com/skycoin/libskycoin test-libc
 RUN [ "cross-build-end" ]
 
 WORKDIR $GOPATH/src/github.com/skycoin
-VOLUME $GOPATH/src/
+VOLUME $GOPATH/src/