From d40c6b224eb5009ef8d8b46c030bb2157ff130fb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 16 Dec 2018 15:58:18 +0100 Subject: [PATCH 1/3] gitlab-ce: 11.5.1 -> 11.5.4 (cherry picked from commit 88fc01b0e6d03d77c4b028a2c8d20c722e28566c) --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index b748e7c49bd2..1734770cd10e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,12 +1,12 @@ { "ce": { - "version": "11.5.1", - "repo_hash": "0drfan4yncvpcbmmb0lcr1zgk2bav2bzza70mwv3a65habhsy0x5", - "deb_hash": "04v5xqimj985718csjzfx7rmnmbfbrm2bp05i4s3x7byrzkl8w9d", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.1-ce.0_amd64.deb/download.deb", + "version": "11.5.4", + "repo_hash": "1mk7zj79cz9g8y6b5p4cznv90h94mwgy14w9vdvmqbgbnx9bayc8", + "deb_hash": "18i3w1k8l5hj3732w3adw3cma78l9hx77wlrgvssg9gz609kqvx6", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.5.4-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.5.1", + "rev": "v11.5.4", "passthru": { "GITALY_SERVER_VERSION": "0.129.0", "GITLAB_PAGES_VERSION": "1.3.1", From 2a91e6b1a10443369c62f964c22850ddcc5b2072 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 16 Dec 2018 15:58:49 +0100 Subject: [PATCH 2/3] gitlab-ee: 11.5.1 -> 11.5.4 (cherry picked from commit 0a87bdecd554dafd0ac6dbd5a41fc14129afbba7) --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 1734770cd10e..1f8f627f5ed6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -15,13 +15,13 @@ } }, "ee": { - "version": "11.5.1", - "repo_hash": "150f7lnci88d821qxxla0dhwly3w59s3yzgvakzfc6p6iy07m9jp", - "deb_hash": "0gg3p4r6xscilw6igjk6l9mcxj3d7npnzg872r5y44p0q8faafhg", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.1-ee.0_amd64.deb/download.deb", + "version": "11.5.4", + "repo_hash": "1rpj34wblhk6yirix16grrlhg4dfna3mjvhn8bz82m94dkhx06lc", + "deb_hash": "05lizhf45xv4j0y0yafrpcrqmav1xmncxxgsm97s2mlhdwn5rfnd", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.4-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.5.1-ee", + "rev": "v11.5.4-ee", "passthru": { "GITALY_SERVER_VERSION": "0.129.0", "GITLAB_PAGES_VERSION": "1.3.1", From 3adcfd41999d3fd7157ea055ba55c74725567214 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 16 Dec 2018 17:03:57 +0100 Subject: [PATCH 3/3] gitlab: run test with 4096 bits if on 64bit, else the the maximum for 32bit (cherry picked from commit c788367edaf5fa8ac24e60d127851a360fe2c134) --- nixos/tests/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index f401fe098dcc..16e0dd723ecf 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { nodes = { gitlab = { ... }: { - virtualisation.memorySize = 2047; + virtualisation.memorySize = if pkgs.stdenv.is64bit then 4096 else 2047; systemd.services.gitlab.serviceConfig.Restart = mkForce "no"; systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no"; systemd.services.gitaly.serviceConfig.Restart = mkForce "no";