Skip to content
Snippets Groups Projects
Commit 9c8a7cc0 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Added s3 upload

parent a02cb64d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 17 deletions
Makefile
+ 27
− 17
View file @ 9c8a7cc0
NAME ?= gitlab-ci-multi-runner
ifeq ($(RELEASE),true) ifeq ($(RELEASE),true)
NAME ?= gitlab-ci-multi-runner PACKAGE_NAME ?= $(NAME)
CONFLICTS ?= gitlab-ci-multi-runner-beta PACKAGE_CONFLICT ?= $(NAME)-beta
else else
NAME ?= gitlab-ci-multi-runner-beta PACKAGE_NAME ?= $(NAME)-beta
CONFLICTS ?= gitlab-ci-multi-runner PACKAGE_CONFLICT ?= $(NAME)
endif endif
REVISION := $(shell git rev-parse --short HEAD || echo unknown) REVISION := $(shell git rev-parse --short HEAD || echo unknown)
VERSION := $(shell git describe --tags || cat VERSION || echo dev) VERSION := $(shell git describe --tags || cat VERSION || echo dev)
...@@ -12,6 +13,7 @@ ITTERATION := $(shell date +%s) ...@@ -12,6 +13,7 @@ ITTERATION := $(shell date +%s)
PACKAGE_CLOUD ?= ayufan/gitlab-ci-multi-runner PACKAGE_CLOUD ?= ayufan/gitlab-ci-multi-runner
PACKAGE_CLOUD_URL ?= https://packagecloud.io/ PACKAGE_CLOUD_URL ?= https://packagecloud.io/
BUILD_PLATFORMS ?= -os="linux" -os="darwin" -os="windows" BUILD_PLATFORMS ?= -os="linux" -os="darwin" -os="windows"
S3_UPLOAD_PATH ?= master
all: deps test lint toolchain build all: deps test lint toolchain build
...@@ -85,8 +87,8 @@ package-deps: ...@@ -85,8 +87,8 @@ package-deps:
package-deb-fpm: package-deb-fpm:
@mkdir -p out/deb/ @mkdir -p out/deb/
fpm -s dir -t deb -n $(NAME) -v $(VERSION) \ fpm -s dir -t deb -n $(PACKAGE_NAME) -v $(VERSION) \
-p out/deb/$(NAME)_$(ARCH).deb \ -p out/deb/$(PACKAGE_NAME)_$(ARCH).deb \
--deb-priority optional --category admin \ --deb-priority optional --category admin \
--force \ --force \
--deb-compression bzip2 \ --deb-compression bzip2 \
...@@ -97,14 +99,14 @@ package-deb-fpm: ...@@ -97,14 +99,14 @@ package-deb-fpm:
-m "Kamil Trzciński <ayufan@ayufan.eu>" \ -m "Kamil Trzciński <ayufan@ayufan.eu>" \
--license "MIT" \ --license "MIT" \
--vendor "ayufan.eu" \ --vendor "ayufan.eu" \
--conflicts $(CONFLICTS) \ --conflicts $(PACKAGE_CONFLICT) \
-a $(ARCH) \ -a $(ARCH) \
out/binaries/$(NAME)-linux-$(ARCH)=/usr/bin/gitlab-ci-multi-runner out/binaries/$(NAME)-linux-$(ARCH)=/usr/bin/gitlab-ci-multi-runner
package-rpm-fpm: package-rpm-fpm:
@mkdir -p out/rpm/ @mkdir -p out/rpm/
fpm -s dir -t rpm -n $(NAME) -v $(VERSION) \ fpm -s dir -t rpm -n $(PACKAGE_NAME) -v $(VERSION) \
-p out/rpm/$(NAME)_$(ARCH).rpm \ -p out/rpm/$(PACKAGE_NAME)_$(ARCH).rpm \
--rpm-compression bzip2 --rpm-os linux \ --rpm-compression bzip2 --rpm-os linux \
--force \ --force \
--after-install packaging/scripts/postinst.rpm \ --after-install packaging/scripts/postinst.rpm \
...@@ -114,7 +116,7 @@ package-rpm-fpm: ...@@ -114,7 +116,7 @@ package-rpm-fpm:
-m "Kamil Trzciński <ayufan@ayufan.eu>" \ -m "Kamil Trzciński <ayufan@ayufan.eu>" \
--license "MIT" \ --license "MIT" \
--vendor "ayufan.eu" \ --vendor "ayufan.eu" \
--conflicts $(CONFLICTS) \ --conflicts $(PACKAGE_CONFLICT) \
-a $(ARCH) \ -a $(ARCH) \
out/binaries/$(NAME)-linux-$(ARCH)=/usr/bin/gitlab-ci-multi-runner out/binaries/$(NAME)-linux-$(ARCH)=/usr/bin/gitlab-ci-multi-runner
...@@ -142,18 +144,26 @@ packagecloud-yank: ...@@ -142,18 +144,26 @@ packagecloud-yank:
ifneq ($(YANK),) ifneq ($(YANK),)
# Removing $(YANK) from packagecloud... # Removing $(YANK) from packagecloud...
-for DIST in debian/wheezy debian/jessie ubuntu/precise ubuntu/trusty ubuntu/utopic; do \ -for DIST in debian/wheezy debian/jessie ubuntu/precise ubuntu/trusty ubuntu/utopic; do \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/$$DIST $(NAME)_$(YANK)_amd64.deb & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/$$DIST $(PACKAGE_NAME)_$(YANK)_amd64.deb & \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/$$DIST $(NAME)_$(YANK)_386.deb & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/$$DIST $(PACKAGE_NAME)_$(YANK)_386.deb & \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/$$DIST $(NAME)_$(YANK)_arm.deb & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/$$DIST $(PACKAGE_NAME)_$(YANK)_arm.deb & \
done; \ done; \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/6 $(NAME)-$(YANK)-1.x86_64.rpm & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/6 $(PACKAGE_NAME)-$(YANK)-1.x86_64.rpm & \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/6 $(NAME)-$(YANK)-1.386.rpm & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/6 $(PACKAGE_NAME)-$(YANK)-1.386.rpm & \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/7 $(NAME)-$(YANK)-1.x86_64.rpm & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/7 $(PACKAGE_NAME)-$(YANK)-1.x86_64.rpm & \
package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/7 $(NAME)-$(YANK)-1.386.rpm & \ package_cloud yank --url $(PACKAGE_CLOUD_URL) $(PACKAGE_CLOUD)/el/7 $(PACKAGE_NAME)-$(YANK)-1.386.rpm & \
wait wait
else else
# No version specified in YANK # No version specified in YANK
@exit 1 @exit 1
endif endif
s3-upload:
export ARTIFACTS_DEST=artifacts; curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash
./artifacts upload \
--permissions public-read \
--working-dir out \
--target-paths "gitlab-ci-multi-runner/$(S3_UPLOAD_PATH)/" \
$(shell cd out/; find . -type f)
FORCE: FORCE:
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment