From 83ac2c880f953580cca5508d197f826b62bc8fed Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Thu, 4 Apr 2019 22:38:01 +0200 Subject: [PATCH] also build ci --- .circleci/config.yml | 50 +++++++++++++++++++++++++++---------- dockerfile/build/Dockerfile | 10 -------- goreleaser.yml | 3 +++ 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3690d3c..63793f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,16 +17,22 @@ workflows: # - testing: # requires: # - checkout + - build: + requires: + - testing + - linting + filters: + tags: + ignore: /^v[0-9]+(\.[0-9]+)*$/ - publishing: requires: - - checkout - # - testing - # - linting - # filters: - # branches: - # ignore: /.*/ - # tags: - # only: /^v[0-9]+(\.[0-9]+)*$/ + - testing + - linting + filters: + branches: + ignore: /.*/ + tags: + only: /^v[0-9]+(\.[0-9]+)*$/ jobs: checkout: executor: go @@ -51,13 +57,12 @@ jobs: at: . - run: go build ./... - run: go test ./... - publishing: + build: executor: go steps: - attach_workspace: at: . - - setup_remote_docker: - docker_layer_caching: true + - setup_remote_docker - run: name: Install Goreleaser command: | @@ -68,8 +73,27 @@ jobs: - run: name: Execute goreleaser command: ../goreleaser --snapshot --skip-publish - - + publishing: + executor: go + steps: + - attach_workspace: + at: . + - setup_remote_docker + - run: + name: Install Goreleaser + command: | + cd .. && \ + wget https://github.com/goreleaser/goreleaser/releases/download/v0.59.0/goreleaser_Linux_x86_64.tar.gz && \ + tar -xvf goreleaser_Linux_x86_64.tar.gz && \ + ./goreleaser -v + - run: + name: Login to docker hub + command: | + echo "$DOCKER_PASS" | docker login -u $DOCKER_USER --password-stdin + - run: + name: Execute goreleaser + command: ../goreleaser + # version: 2 # jobs: # build: diff --git a/dockerfile/build/Dockerfile b/dockerfile/build/Dockerfile index a887634..e68a80b 100644 --- a/dockerfile/build/Dockerfile +++ b/dockerfile/build/Dockerfile @@ -1,5 +1,4 @@ FROM golang:1.7.4 -MAINTAINER Fabrizio Steiner ARG BUILD_DATE ARG VCS_REF @@ -11,18 +10,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.version="$VERSION" \ org.label-schema.schema-version="1.0" -ARG glide=0.12.3 ARG goreleaser=0.59.0 ARG docker=17.05.0-ce -# Install glide binary -RUN curl --silent --show-error --fail --location \ - --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ - "https://github.com/Masterminds/glide/releases/download/v${glide}/glide-v${glide}-linux-amd64.tar.gz" \ - | tar --no-same-owner -xz linux-amd64/glide -O > /usr/bin/glide \ - && chmod 0755 /usr/bin/glide \ - && /usr/bin/glide -v - # Install goreleaser binary RUN curl --silent --show-error --fail --location \ --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ diff --git a/goreleaser.yml b/goreleaser.yml index 2941451..6bc982b 100644 --- a/goreleaser.yml +++ b/goreleaser.yml @@ -31,6 +31,7 @@ dockers: image: containrrr/watchtower dockerfile: dockerfile/amd64/Dockerfile tag_templates: + - 'latest' - '{{ .Version }}' - goos: linux @@ -40,6 +41,7 @@ dockers: image: containrrr/watchtower dockerfile: dockerfile/armhf/Dockerfile tag_templates: + - 'armhf-latest' - 'armhf-{{ .Version }}' - goos: linux @@ -49,4 +51,5 @@ dockers: image: containrrr/watchtower dockerfile: dockerfile/arm64v8/Dockerfile tag_templates: + - 'arm64v8-latest' - 'arm64v8-{{ .Version }}'