Control: tags -1 + patch
Hello Dmitry Smirnov,
It seems you've forgot to push upstream/pristine-tar branches
and tags when you did the last update/upload of the package.
Could you please push them?
I'm attaching a patch to fix the FTBFS bug that seems to have
just gotten this package removed from testing.
Original bug report quoted below for your convenience.
Regards,
Andreas Henriksson
On Sat, Oct 20, 2018 at 03:19:38PM +0800, Shengjing Zhu wrote:
> Source: gitlab-ci-multi-runner
> Version: 11.2.0+dfsg-1
> Severity: serious
> Tags: ftbfs
>
> Dear Maintainer,
>
> When rebuild gitlab-ci-multi-runner, it FTBFS,
>
> # gitlab.com/gitlab-org/gitlab-runner/commands
> src/gitlab.com/gitlab-org/gitlab-runner/commands/multi.go:365:54: too
> many arguments in call to
> "github.com/prometheus/client_golang/prometheus".NewProcessCollector
> have (int, string)
> want
> ("github.com/prometheus/client_golang/prometheus".ProcessCollectorOpts)
>
>
> --
> Shengjing Zhu
>
>From 4356d8d0ebe85391c3882a971a03e3677e70598a Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 19 Nov 2018 19:17:49 +0100
Subject: [PATCH 1/2] Add debian/patches/fix-ftbfs-911437.patch
Closes: #911437
---
debian/patches/fix-ftbfs-911437.patch | 17 +++++++++++++++++
debian/patches/series | 1 +
2 files changed, 18 insertions(+)
create mode 100644 debian/patches/fix-ftbfs-911437.patch
diff --git a/debian/patches/fix-ftbfs-911437.patch b/debian/patches/fix-ftbfs-911437.patch
new file mode 100644
index 0000000..bbe9acc
--- /dev/null
+++ b/debian/patches/fix-ftbfs-911437.patch
@@ -0,0 +1,17 @@
+--- a/commands/multi.go
++++ b/commands/multi.go
+@@ -362,7 +362,13 @@
+ // Go-specific metrics about the process (GC stats, goroutines, etc.).
+ registry.MustRegister(prometheus.NewGoCollector())
+ // Go-unrelated process metrics (memory usage, file descriptors, etc.).
+- registry.MustRegister(prometheus.NewProcessCollector(os.Getpid(), ""))
++ registry.MustRegister(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{
++ PidFn: func() (int, error) {
++ p := os.Getpid()
++ return p, nil
++ },
++ Namespace: "",
++ }))
+
+ // Register all executor provider collectors
+ for _, provider := range common.GetExecutorProviders() {
diff --git a/debian/patches/series b/debian/patches/series
index a684cc5..282e0a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ test--TestMachinePreCreateMode.patch
test--TestDockerCommandMissing.patch
test--git.patch
test--tmp-docker.patch
+fix-ftbfs-911437.patch
--
2.19.1
