@@ -1,31 +1,54 @@
1−{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:
1+{ lib, buildGoModule, fetchFromGitLab, fetchurl }:
22
33let
4− version = "14.7.0";
4+ version = "14.8.0";
55in
6−buildGoPackage rec {
6+buildGoModule rec {
77 inherit version;
88 pname = "gitlab-runner";
9− goPackagePath = "gitlab.com/gitlab-org/gitlab-runner";
10− subPackages = [ "." ];
11− commonPackagePath = "${goPackagePath}/common";
9+
10+ commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common";
1211 ldflags = [
1312 "-X ${commonPackagePath}.NAME=gitlab-runner"
1413 "-X ${commonPackagePath}.VERSION=${version}"
1514 "-X ${commonPackagePath}.REVISION=v${version}"
1615 ];
1716
17+ vendorSha256 = "sha256-MdGLl77DFXPudt26qICSH+1UuQAR8Rb/nl0Ykb0hjgE=";
18+
1819 src = fetchFromGitLab {
1920 owner = "gitlab-org";
2021 repo = "gitlab-runner";
2122 rev = "v${version}";
22− sha256 = "0l7bbmhvgz12nq52nmvgs1qmcknikw8f2dn9l93ijb1sr495fygl";
23+ sha256 = "sha256-+DwOKlFu9m2kt4DwaSp/Jq3eZ/+FFxV1Q7bKOy5DfoE=";
2324 };
2425
2526 patches = [
2627 ./fix-shell-path.patch
2728 ];
2829
30+ prePatch = ''
31+ # Remove some tests that can't work during a nix build
32+
33+ # Requires to run in a git repo
34+ sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go
35+ sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go
36+
37+ # No writable developer environment
38+ rm common/build_test.go
39+ rm executors/custom/custom_test.go
40+
41+ # No docker during build
42+ rm executors/docker/terminal_test.go
43+ rm executors/docker/docker_test.go
44+ rm helpers/docker/auth/auth_test.go
45+ '';
46+
47+ preCheck = ''
48+ # Make the tests pass outside of GitLab CI
49+ export CI=0
50+ '';
51+
2952 meta = with lib; {
3053 description = "GitLab Runner the continuous integration executor of GitLab";
3154 license = licenses.mit;