Skip to content

Commit

Permalink
gitlab-runner: 9.5.0 -> 10.0.0 (#29821)
Browse files Browse the repository at this point in the history
The renaming of gitlab-ci-mutli-runner to gitlab-runner
is finally complete. Symlinking is thus no longer needed.
  • Loading branch information
bachp authored and joachifm committed Sep 29, 2017
1 parent 4a2dd99 commit 824f2e2
Showing 1 changed file with 8 additions and 10 deletions.
@@ -1,22 +1,22 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:

let
version = "9.5.0";
version = "10.0.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "05vph5pqw3wlrh76bfgrmhgzsjsf7llzscr9vr7nk3b2pcigawdp";
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
sha256 = "13rfpyzrld20pjhkjzx78qfdmi4w86v6nhq3460bcjpi4kwyd24w";
};

docker_arm = fetchurl {
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "0ilp793kbw0n6nhbcdqc1cb05h2ir27c1rkijyxaqvpczrm11lqj";
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
sha256 = "19z3rmkmv6z6g27bsjkqkfj8xwpyf9v1fhk2vb81xj5fisjzhmlw";
};
in
buildGoPackage rec {
inherit version;
name = "gitlab-runner-${version}";
goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner";
goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
commonPackagePath = "${goPackagePath}/common";
buildFlagsArray = ''
-ldflags=
Expand All @@ -27,9 +27,9 @@ buildGoPackage rec {

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-ci-multi-runner";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "0zpyvaflq62qazjw60xnzfw52fqbcmjaqig9y8i6wjzdzlm803f0";
sha256 = "11gp6l5kqcz4spxq552hsnw480vdhp70zmqlgjr906px3r31j7h3";
};

patches = [ ./fix-shell-path.patch ];
Expand All @@ -54,8 +54,6 @@ buildGoPackage rec {

postInstall = ''
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; {
Expand Down

0 comments on commit 824f2e2

Please sign in to comment.