diff options
author | Pascal Bach <pasci.bach@gmail.com> | 2018-07-29 20:59:11 +0200 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-29 20:59:11 +0200 |
commit | 41efb9a6c8c9e2c17a43228c5823472a1b9612bd (patch) | |
tree | c4d81ee67b874e20173471dd75d34217d018f798 /pkgs/development/tools/continuous-integration | |
parent | c735294fba60e5444190021ec660038d59b8c7d7 (diff) |
gitlab-runner: 11.0.0 -> 11.1.0 (#44085)
Diffstat (limited to 'pkgs/development/tools/continuous-integration')
-rw-r--r-- | pkgs/development/tools/continuous-integration/gitlab-runner/default.nix | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 33dc7c80c17a..479bfe35e969 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: +{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.0.0"; + version = "11.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1wi2wza991hhys60c8f3rhad8dqargnb6i7xwfsxrjd26dsbif2b"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; + sha256 = "0l7j69isnp6wlix3ysjxcr9dgcx5a0j9z2k0bsl714ff339js6j5"; }; docker_arm = fetchurl { - url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1y67zxxad2jy1rvfhdlp194fi0qgwrnlcs24zh5lzwvsnwvc13bg"; + url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; + sha256 = "16x9wbyd90jgyn7x45j9cyrdfz4hg8qav132schqrrdfrgjyrb4x"; }; in buildGoPackage rec { @@ -29,31 +29,16 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "06p8fggnxn2afy0k4wjh44d1qby9n2j0mq6cl206cckzh2gfsknp"; + sha256 = "0b632jnqbj74nx27nlpiia6nq8668gf41lcb4s24gw9jnfmrwhym"; }; patches = [ ./fix-shell-path.patch ]; - buildInputs = [ go-bindata ]; - - preBuild = '' - ( - # go-bindata names the assets after the filename thus we create a symlink with the name we want - cd go/src/${goPackagePath} - ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz - ln -sf ${docker_arm} prebuilt-arm.tar.xz - go-bindata \ - -pkg docker \ - -nocompress \ - -nomemcopy \ - -o executors/docker/bindata.go \ - prebuilt-x86_64.tar.xz \ - prebuilt-arm.tar.xz - ) - ''; - postInstall = '' - install -d $out/bin + touch $bin/bin/hello + install -d $bin/bin/helper-images + ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz ''; meta = with lib; { |