summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2021-03-20 10:02:27 +0300
committerValery Piashchynski <[email protected]>2021-03-20 10:02:27 +0300
commitfdd1585b4f9423933b380aba0d0950ce7abfcb49 (patch)
treed33083d4be6b5608b209e084a3c2627c177ce3af
parentc8f3b79de529b85b4910157f2cafbc25349ad8de (diff)
- Fix CI in the PR
- Fix type in the metrics plugin Register method
-rw-r--r--.github/workflows/linux.yml10
-rw-r--r--plugins/metrics/plugin.go3
2 files changed, 2 insertions, 11 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index c5fde431..a478726d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,14 +1,6 @@
name: Tests
-on:
- push:
- pull_request:
- branches:
- # Branches from forks have the form 'user:branch-name' so we only run
- # this job on pull_request events for branches that look like fork
- # branches. Without this we would end up running this job twice for non
- # forked PRs, once for the push and then once for opening the PR.
- - "**:**"
+on: [push, pull_request]
jobs:
golang:
diff --git a/plugins/metrics/plugin.go b/plugins/metrics/plugin.go
index 651a2475..efcbfc50 100644
--- a/plugins/metrics/plugin.go
+++ b/plugins/metrics/plugin.go
@@ -75,8 +75,7 @@ func (m *Plugin) Init(cfg config.Configurer, log logger.Logger) error {
}
// Register new prometheus collector.
-func (m *Plugin) Register(c
-) error {
+func (m *Plugin) Register(c prometheus.Collector) error {
return m.registry.Register(c)
}