Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions pkgs/by-name/gi/gitlab-runner/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

buildGoModule (finalAttrs: {
pname = "gitlab-runner";
version = "17.2.0";
version = "17.10.1";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
tag = "v${finalAttrs.version}";
hash = "sha256-a2Igy4DS3fYTvPW1vvDrH/DjMQ4lG9cm/P3mFr+y9s4=";
hash = "sha256-pLmDWZHxd9dNhmbcHJRBxPuY0IpcJoXz/fOJeP1lVlA=";
};

vendorHash = "sha256-1MwHss76apA9KoFhEU6lYiUACrPMGYzjhds6nTyNuJI=";
vendorHash = "sha256-1NteDxcGjsC0kT/9u7BT065EN/rBhaNznegdPHZUKxo=";

# For patchShebangs
nativeBuildInputs = [ bash ];
Expand All @@ -33,32 +33,43 @@ buildGoModule (finalAttrs: {
''
# Remove some tests that can't work during a nix build

# Requires to run in a git repo
# Needs the build directory to be a git repo
sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go
sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go
rm shells/abstract_test.go

# No writable developer environment
rm common/build_test.go
rm common/build_settings_test.go
rm common/build_test.go
rm executors/custom/custom_test.go

# No docker during build
rm executors/docker/terminal_test.go
# No Docker during build
rm executors/docker/docker_test.go
rm helpers/docker/auth/auth_test.go
rm executors/docker/services_test.go
rm executors/docker/terminal_test.go
rm helpers/docker/auth/auth_test.go

# No Kubernetes during build
rm executors/kubernetes/feature_test.go
rm executors/kubernetes/kubernetes_test.go
rm executors/kubernetes/overwrites_test.go
''
+ lib.optionalString stdenv.buildPlatform.isDarwin ''
# Invalid bind arguments break Unix socket tests
sed -i "s/func TestRunnerWrapperCommand_createListener/func OFF_TestRunnerWrapperCommand_createListener/" commands/wrapper_test.go

# No keychain access during build breaks X.509 certificate tests
rm helpers/certificate/x509_test.go
rm network/client_test.go
sed -i "s/func TestCertificate/func OFF_TestCertificate/" helpers/certificate/x509_test.go
sed -i "s/func TestClientInvalidSSL/func OFF_TestClientInvalidSSL/" network/client_test.go
'';

excludedPackages = [
# CI helper script for pushing images to Docker and ECR registries
# Nested dependency Go module, used with go.mod replace directive
#
# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139
"./scripts/sync-docker-images"
# https://gitlab.com/gitlab-org/gitlab-runner/-/commit/57ea9df5d8a8deb78c8d1972930bbeaa80d05e78
"./helpers/runner_wrapper/api"
# Helper scripts for upstream Make targets, not intended for downstream consumers
"./scripts"
];

ldflags =
Expand Down