gitlab-runner: 9.5.0 -> 10.0.0 (#29821)

The renaming of gitlab-ci-mutli-runner to gitlab-runner
is finally complete. Symlinking is thus no longer needed.
This commit is contained in:
Pascal Bach 2017-09-29 16:00:25 +02:00 committed by Joachim F
parent 4a2dd9905c
commit 824f2e2a28

View File

@ -1,22 +1,22 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
let let
version = "9.5.0"; version = "10.0.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl { docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "05vph5pqw3wlrh76bfgrmhgzsjsf7llzscr9vr7nk3b2pcigawdp"; sha256 = "13rfpyzrld20pjhkjzx78qfdmi4w86v6nhq3460bcjpi4kwyd24w";
}; };
docker_arm = fetchurl { docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "0ilp793kbw0n6nhbcdqc1cb05h2ir27c1rkijyxaqvpczrm11lqj"; sha256 = "19z3rmkmv6z6g27bsjkqkfj8xwpyf9v1fhk2vb81xj5fisjzhmlw";
}; };
in in
buildGoPackage rec { buildGoPackage rec {
inherit version; inherit version;
name = "gitlab-runner-${version}"; name = "gitlab-runner-${version}";
goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner"; goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
commonPackagePath = "${goPackagePath}/common"; commonPackagePath = "${goPackagePath}/common";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=
@ -27,9 +27,9 @@ buildGoPackage rec {
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-ci-multi-runner"; repo = "gitlab-runner";
rev = "v${version}"; rev = "v${version}";
sha256 = "0zpyvaflq62qazjw60xnzfw52fqbcmjaqig9y8i6wjzdzlm803f0"; sha256 = "11gp6l5kqcz4spxq552hsnw480vdhp70zmqlgjr906px3r31j7h3";
}; };
patches = [ ./fix-shell-path.patch ]; patches = [ ./fix-shell-path.patch ];
@ -54,8 +54,6 @@ buildGoPackage rec {
postInstall = '' postInstall = ''
install -d $out/bin install -d $out/bin
# The recommended name is gitlab-runner so we create a symlink with that name
ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner
''; '';
meta = with lib; { meta = with lib; {