From dedaa2d82fa7237b0878478fd6018f21981e4b1b Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin <tomasz@maczukin.pl> Date: Wed, 5 Feb 2020 18:50:26 +0100 Subject: [PATCH] Add gitlab-runner-helper binaries to S3 release --- .gitlab/ci/prebuild.gitlab-ci.yml | 2 +- .gitlab/ci/release.gitlab-ci.yml | 14 +++++++++++++- Makefile | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/prebuild.gitlab-ci.yml b/.gitlab/ci/prebuild.gitlab-ci.yml index 1b4a499307f..2becdebe1e3 100644 --- a/.gitlab/ci/prebuild.gitlab-ci.yml +++ b/.gitlab/ci/prebuild.gitlab-ci.yml @@ -8,7 +8,7 @@ helper images: artifacts: paths: - out/helper-images/ - - dockerfiles/build/binaries/*-windows.exe + - dockerfiles/build/binaries/gitlab-runner-helper* - .gopath/bin - .gopath/.ok expire_in: 7d diff --git a/.gitlab/ci/release.gitlab-ci.yml b/.gitlab/ci/release.gitlab-ci.yml index ba028b5344c..aac8c193fc1 100644 --- a/.gitlab/ci/release.gitlab-ci.yml +++ b/.gitlab/ci/release.gitlab-ci.yml @@ -12,7 +12,7 @@ needs: - 'helper images' - 'binaries linux/386 linux/amd64 linux/arm linux/arm64' - - package-deb + - 'package-deb' script: - source ci/touch_make_dependencies - make release_docker_images @@ -48,6 +48,15 @@ .release_s3: extends: - .release + needs: + - 'helper images' + - 'test coverage report' + - 'binaries darwin/386 darwin/amd64' + - 'binaries freebsd/386 freebsd/amd64 freebsd/arm' + - 'binaries linux/386 linux/amd64 linux/arm linux/arm64' + - 'binaries windows/386 windows/amd64' + - 'package-deb' + - 'package-rpm' before_script: - source ci/touch_make_dependencies script: @@ -61,6 +70,9 @@ fi .release_packagecloud: + needs: + - 'package-deb' + - 'package-rpm' extends: - .release script: diff --git a/Makefile b/Makefile index fae522a2a07..2bcb977a202 100644 --- a/Makefile +++ b/Makefile @@ -229,7 +229,7 @@ release_packagecloud: # Releasing to https://packages.gitlab.com/runner/ @./ci/release_packagecloud "$$CI_JOB_NAME" -release_s3: prepare_windows_zip prepare_zoneinfo prepare_index +release_s3: copy_helper_binaries prepare_windows_zip prepare_zoneinfo prepare_index # Releasing to S3 @./ci/release_s3 @@ -243,6 +243,11 @@ prepare_zoneinfo: # preparing the zoneinfo file @cp $$GOROOT/lib/time/zoneinfo.zip out/ +copy_helper_binaries: + # copying helper binaries + @mkdir -p out/binaries/gitlab-runner-helper + @cp dockerfiles/build/binaries/gitlab-runner-helper* out/binaries/gitlab-runner-helper/ + prepare_index: export CI_COMMIT_REF_NAME ?= $(BRANCH) prepare_index: export CI_COMMIT_SHA ?= $(REVISION) prepare_index: $(RELEASE_INDEX_GENERATOR) -- GitLab