Merge pull request #91 from simelo/stdevHan_t75_not_deploy_circle

Fixes #75 Correcting deploy in Circle CI
skycoin · Jul 3, 2019 · 0219090 · 0219090
2 parents 06dd0f4 + d4adfbb
commit 0219090
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   orangepi-plus2:
     docker:
-      - image: docker:18.06.0-ce-git
+      - image: circleci/golang:1.12
     working_directory: $GOPATH/src/github.com/skycoin/libskycoin
     environment:
       QEMU_PLATFORM: orangepi-plus2
@@ -12,11 +12,12 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 18.06.0-ce
+          docker_layer_caching: true
       - run: docker build  --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile  $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test
 
   raspberrypi3:
     docker:
-      - image: docker:18.06.0-ce-git
+      - image: circleci/golang:1.12
     working_directory: $GOPATH/src/github.com/skycoin/libskycoin
     environment:
       QEMU_PLATFORM: raspberrypi3
@@ -26,11 +27,12 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 18.06.0-ce
+          docker_layer_caching: true
       - run: docker build  --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile  $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test
 
   raspberrypi2:
     docker:
-      - image: docker:18.06.0-ce-git
+      - image: circleci/golang:1.12
     working_directory: $GOPATH/src/github.com/skycoin/libskycoin
     environment:
       QEMU_PLATFORM: raspberry-pi2
@@ -40,11 +42,12 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 18.06.0-ce
+          docker_layer_caching: true
       - run: docker build  --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile  $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test
 
   bananapi_m1_plus:
     docker:
-      - image: docker:18.06.0-ce-git
+      - image: circleci/golang:1.12
     working_directory: $GOPATH/src/github.com/skycoin/libskycoin
     environment:
       QEMU_PLATFORM: bananapi-m1-plus
@@ -54,28 +57,27 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 18.06.0-ce
+          docker_layer_caching: true
       - run: docker build  --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile  $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test
 
   publish-github-release_32:
     docker:
-      - image: docker:18.06.0-ce-git
+      - image: circleci/golang:1.12
     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 [[ $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
+          docker_layer_caching: true
+      - run: bash $GOPATH/src/github.com/skycoin/libskycoin/ci-scripts/deploy-arm.sh
 
 workflows:
   version: 2
   arm_test:
     jobs:
-      - bananapi_m1_plus
-      - raspberrypi2
       - raspberrypi3
-      - orangepi-plus2      
+      - orangepi-plus2
+      - raspberrypi2
+      - bananapi_m1_plus
       - publish-github-release_32
diff --git a/ci-scripts/deploy-arm.sh b/ci-scripts/deploy-arm.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -x
+
+git --version
+
+export VERSION="$(git describe --tags --exact-match HEAD)"
+
+if [[ "$VERSION" ]]; 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
diff --git a/docker/images/deploy-arm/Dockerfile b/docker/images/deploy-arm/Dockerfile
@@ -5,6 +5,7 @@ ARG GITHUB_OAUTH_TOKEN
 ARG PROJECT_USERNAME
 ARG PROJECT_REPONAME
 ARG SHA1
+ARG VERSION
 ADD . $GOPATH/src/github.com/skycoin/libskycoin/
 
 RUN [ "cross-build-start" ]
@@ -15,9 +16,8 @@ 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 tag -l --points-at HEAD)"
-RUN export ARCH="$(uname -m)"
-RUN export OS="$(uname -s)"
+ENV ARCH="armv7"
+ENV OS="Linux"
 RUN make -C $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