From 741fd143afe57434134ce68820c12be28c596866 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 14:10:03 -0700 Subject: [PATCH 1/8] Travis tweaks for Docker --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2114bc3..8f559e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: go +dist: bionic +services: +- docker go: - 1.14.x addons: @@ -8,7 +11,6 @@ addons: - fakeroot - bash-completion - libpcsclite-dev - - docker-ce env: global: - V=1 From eb6e2191d57ca21b4fdedeb03b0d71daabcaaf46 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 16:15:58 -0700 Subject: [PATCH 2/8] Docker build tweaks --- debian/changelog | 4 ++-- make/docker.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48efaee7..795d0818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -step-certificates (0.8.4-14-ge72f087-dev) unstable; urgency=medium +step-certificates (0.15.1~rc.1~2~gd073a0a~dev) unstable; urgency=medium * See https://github.com/smallstep/certificates/releases - -- Smallstep Labs, Inc. Wed, 20 Feb 2019 20:44:25 +0000 + -- Smallstep Labs, Inc. Tue, 18 Aug 2020 18:40:32 +0000 diff --git a/make/docker.mk b/make/docker.mk index 2eb60a9c..7efc4a60 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -21,14 +21,14 @@ DOCKER_IMAGE_NAME = smallstep/step-ca docker-prepare: # Ensure, we can build for ARM architecture ifeq (linux,$(DOCKER_CLIENT_OS)) - [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64 + [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged linuxkit/binfmt:v0.8-amd64 endif # Register buildx builder mkdir -p $$HOME/.docker/cli-plugins test -f $$HOME/.docker/cli-plugins/docker-buildx || \ - (wget -O $$HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.$(DOCKER_CLIENT_OS)-amd64 && \ + (wget -q -O $$HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.$(DOCKER_CLIENT_OS)-amd64 && \ chmod +x $$HOME/.docker/cli-plugins/docker-buildx) # Called directly instead of via `docker buildx` because From 22bac129ec3e52652e6b5fdf2bbcd7b552f70d96 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 16:33:43 -0700 Subject: [PATCH 3/8] Try focal + docker on Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8f559e2c..c0cd4e7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -dist: bionic +dist: focal services: - docker go: From 998162392b9ae6a2ef10474a5a29808e50cc0a3b Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 16:48:12 -0700 Subject: [PATCH 4/8] Attempt at parallelism --- .travis.yml | 31 ++++++++++++++++++------------- make/docker.mk | 10 ++++------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0cd4e7a..8d313010 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,32 @@ language: go dist: focal services: -- docker + - docker go: -- 1.14.x + - 1.14.x addons: apt: packages: - - debhelper - - fakeroot - - bash-completion - - libpcsclite-dev + - debhelper + - fakeroot + - bash-completion + - libpcsclite-dev env: global: - - V=1 + - V=1 before_script: -- make bootstrap -script: -- make -- make artifacts + - make bootstrap +jobs: + include: + - script: make lint + - script: make test + - stage: build + script: + - make build + - make artifacts after_success: -- bash <(curl -s https://codecov.io/bash) -t "$CODECOV_TOKEN" || echo "Codecov did - not collect coverage reports" + - bash <(curl -s https://codecov.io/bash) -t "$CODECOV_TOKEN" || echo "Codecov did + not collect coverage reports" notifications: email: false deploy: diff --git a/make/docker.mk b/make/docker.mk index 7efc4a60..b1df244b 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -6,9 +6,6 @@ # binary is copied to a new image that is optimized for size. ######################################### -# Testing: output images to out/ with -o out, like this: -# docker buildx build . --progress plain -t step-ca:master -f docker/Dockerfile --platform linux/amd64,linux/arm/v7,linux/386,linux/arm64 -o out - ifeq (, $(shell which docker)) DOCKER_CLIENT_OS := linux else @@ -33,7 +30,7 @@ endif # Called directly instead of via `docker buildx` because # Travis runs a pre-19.03 Docker that doesn't support plugin discovery - $$HOME/.docker/cli-plugins/docker-buildx create --use --name mybuilder --platform="$(DOCKER_PLATFORMS)" || true + docker buildx create --use --name mybuilder --platform="$(DOCKER_PLATFORMS)" || true .PHONY: docker-prepare @@ -58,11 +55,12 @@ docker-login: define DOCKER_BUILDX # $(1) -- Image Tag # $(2) -- Push (empty is no push | --push will push to dockerhub) - $$HOME/.docker/cli-plugins/docker-buildx build . --progress plain -t $(DOCKER_IMAGE_NAME):$(1) -f docker/Dockerfile.step-ca --platform="$(DOCKER_PLATFORMS)" $(2) + docker buildx build . --progress plain -t $(DOCKER_IMAGE_NAME):$(1) -f docker/Dockerfile.step-ca --platform="$(DOCKER_PLATFORMS)" $(2) endef # For non-master builds don't build the docker containers. -docker-branch: +docker-branch: docker-prepare + $(call DOCKER_BUILDX,$(VERSION),) # For master builds don't build the docker containers. docker-master: From be26c294ca4accf9f9b57d5823dd7b1cc64fd679 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 17:00:32 -0700 Subject: [PATCH 5/8] More Travis tweaks --- .travis.yml | 13 +++++++------ make/docker.mk | 8 +++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d313010..04cf8add 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: go +os: linux dist: focal services: - docker @@ -18,10 +19,10 @@ before_script: - make bootstrap jobs: include: - - script: make lint - - script: make test - - stage: build - script: + - stage: lint + script: make lint + - script: + - make test - make build - make artifacts after_success: @@ -31,8 +32,8 @@ notifications: email: false deploy: provider: releases - skip_cleanup: true - api_key: + cleanup: false + token: secure: EVV43Vkqn67hhKGYn4WhQp2YO6KFmUDSkLXjYXYGX07Fm8p5KjRFBPOz9LV83QrvVmLigvg0CtR8Jqqcnq2SUhus3nhZaN2g19NhMypZLioyOVP0kAkas8ocuvxkwz3YxIK/yMrmTKbQ7JGXtbc8IjAox9ovNo1fFIQmVMAzPfu++OWBJ0j+gUqKtpaNA7gzsSv8UOw3/T3hNm6E1IbpWxl9BPSOzUOE9F/QOThANzifGfdxvqNJFkAgqu5DVPz8zQNbMrz4zH+KwASKxd6hjhzSSMzouKzOEHTA/elDCHEjke0Jos29MkGWHcIydLtCD95DGecqM8BFSC9f2acHDjmUO1rdfoLA3Pt+UiZJuTwyQm/jrHHhRnH8oJpK15G5LvxSqzY9YDWpAk38+jMw/udW6wt7BGAU8FEXLbq0bsFL3yfTepeWjmzT5WS0YXdiBz2SEK+Og9R2bSdtl4owghRzKNio5DNPuYAbqbpi+jqzqQVLj27x7LWoQ0MHvZcz9U+oO00r6M1tDCmFVRdtfgb2H+MIDY69qYGo5qoGMfH1btCWR8bA9wSYB/Z7hW/xZT9r7f/d5/P40k8yKINmTZqyUTQeplrE3y4BPVzKksclczBZa67syIUQ49I35QppnH4GFQHUwlra7r3W9zfZRvaLnp5qOIKAQe3MAIZqtLg= file_glob: true file: .travis-releases/* diff --git a/make/docker.mk b/make/docker.mk index b1df244b..1abe85a7 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -17,9 +17,9 @@ DOCKER_IMAGE_NAME = smallstep/step-ca docker-prepare: # Ensure, we can build for ARM architecture -ifeq (linux,$(DOCKER_CLIENT_OS)) - [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged linuxkit/binfmt:v0.8-amd64 -endif +# ifeq (linux,$(DOCKER_CLIENT_OS)) + # [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged linuxkit/binfmt:v0.8-amd64 +# endif # Register buildx builder mkdir -p $$HOME/.docker/cli-plugins @@ -28,8 +28,6 @@ endif (wget -q -O $$HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.$(DOCKER_CLIENT_OS)-amd64 && \ chmod +x $$HOME/.docker/cli-plugins/docker-buildx) - # Called directly instead of via `docker buildx` because - # Travis runs a pre-19.03 Docker that doesn't support plugin discovery docker buildx create --use --name mybuilder --platform="$(DOCKER_PLATFORMS)" || true .PHONY: docker-prepare From 271c852773ec28af1102050ac96cc0639cded233 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 17:06:03 -0700 Subject: [PATCH 6/8] Add back qemu --- make/docker.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/docker.mk b/make/docker.mk index 1abe85a7..117b7cc2 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -17,9 +17,9 @@ DOCKER_IMAGE_NAME = smallstep/step-ca docker-prepare: # Ensure, we can build for ARM architecture -# ifeq (linux,$(DOCKER_CLIENT_OS)) - # [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged linuxkit/binfmt:v0.8-amd64 -# endif +ifeq (linux,$(DOCKER_CLIENT_OS)) + [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged linuxkit/binfmt:v0.8-amd64 +endif # Register buildx builder mkdir -p $$HOME/.docker/cli-plugins From 821a464ae57086106f6567266fa806cadd6a6391 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 17:27:38 -0700 Subject: [PATCH 7/8] Remove docker testing from makefile --- .travis.yml | 11 +++-------- make/docker.mk | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04cf8add..6cf93c46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,14 +17,9 @@ env: - V=1 before_script: - make bootstrap -jobs: - include: - - stage: lint - script: make lint - - script: - - make test - - make build - - make artifacts +script: + - make + - make artifacts after_success: - bash <(curl -s https://codecov.io/bash) -t "$CODECOV_TOKEN" || echo "Codecov did not collect coverage reports" diff --git a/make/docker.mk b/make/docker.mk index 117b7cc2..1c932d74 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -57,8 +57,7 @@ define DOCKER_BUILDX endef # For non-master builds don't build the docker containers. -docker-branch: docker-prepare - $(call DOCKER_BUILDX,$(VERSION),) +docker-branch: # For master builds don't build the docker containers. docker-master: From 066017ae81c675e8d57d49c23c8abc834e9e2f60 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 17:38:16 -0700 Subject: [PATCH 8/8] revert debian/changelog --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 795d0818..48efaee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -step-certificates (0.15.1~rc.1~2~gd073a0a~dev) unstable; urgency=medium +step-certificates (0.8.4-14-ge72f087-dev) unstable; urgency=medium * See https://github.com/smallstep/certificates/releases - -- Smallstep Labs, Inc. Tue, 18 Aug 2020 18:40:32 +0000 + -- Smallstep Labs, Inc. Wed, 20 Feb 2019 20:44:25 +0000