push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,22 @@
diff --git a/registry/storage/driver/middleware/urlcache/urlcache_test.go b/registry/storage/driver/middleware/urlcache/urlcache_test.go
index 67ef4abc0e..6644c80837 100644
--- a/registry/storage/driver/middleware/urlcache/urlcache_test.go
+++ b/registry/storage/driver/middleware/urlcache/urlcache_test.go
@@ -37,7 +37,7 @@
name: "missing redis cache",
options: make(map[string]any),
wantErr: true,
- errContains: "urlcache middleware requires `cache` Redis configured",
+ errContains: "`_redisCache` key has not been passed to urlcache middleware",
},
{
name: "default configuration with redis",
@@ -231,7 +231,7 @@
"_redisCache": "not a redis cache",
},
wantErr: true,
- errContains: "unusable redis cache object",
+ errContains: "redis cache passed to the middleware cannot be used as the type is wrong",
},
}

View File

@@ -0,0 +1,46 @@
{
lib,
buildGo124Module,
fetchFromGitLab,
}:
buildGo124Module rec {
pname = "gitlab-container-registry";
version = "4.28.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-0v39mQ0wLq2VUYNeDU6E2M8Ny/e/A3VrE8+pmpwJgug=";
};
vendorHash = "sha256-tCOXSZjJOWHTIdWYxdBaH6STKAwqlHsuDfhGd2KPx1Q=";
checkFlags =
let
skippedTests = [
# requires internet
"TestHTTPChecker"
# requires s3 credentials/urls
"TestS3DriverPathStyle"
# flaky
"TestPurgeAll"
];
in
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "GitLab Docker toolset to pack, ship, store, and deliver content";
license = licenses.asl20;
teams = with teams; [
gitlab
cyberus
];
platforms = platforms.unix;
};
}