Skip to content

Commit c6444ff

Browse files
dwillcocksdwillcocks
committed
update things for vuln management
1 parent 6789b11 commit c6444ff

File tree

9 files changed

+331
-1250
lines changed

9 files changed

+331
-1250
lines changed

‎.github/workflows/build.yaml

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
tags-ignore:
8+
- v*
9+
pull_request:
10+
branches:
11+
- main
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Slack Start Report
18+
uses: act10ns/[email protected]
19+
if: always()
20+
with:
21+
status: starting
22+
channel: '#github-actions'
23+
env:
24+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TOKEN }}
25+
26+
- name: Checkout
27+
uses: actions/checkout@v2
28+
29+
- name: Set up Go
30+
uses: actions/setup-go@v2
31+
with:
32+
go-version: 1.16
33+
34+
- name: Lint
35+
uses: golangci/golangci-lint-action@v2
36+
with:
37+
skip-go-installation: true
38+
39+
- name: Build
40+
uses: goreleaser/[email protected]
41+
with:
42+
version: latest
43+
args: release --snapshot --rm-dist
44+
45+
- name: Slack Finish Report
46+
uses: act10ns/[email protected]
47+
if: always()
48+
with:
49+
status: ${{ job.status }}
50+
steps: ${{ toJson(steps) }}
51+
channel: '#github-actions'
52+
env:
53+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TOKEN }}

‎.github/workflows/pr.yaml

-27
This file was deleted.

‎.github/workflows/release.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929

3030
- name: Login DockerHub
3131
id: dockerLogin
32-
uses: docker/login-action@v1.9.0
32+
uses: docker/login-action@v1.10.0
3333
with:
3434
username: ${{ secrets.DOCKERHUB_BOT_USERNAME }}
3535
password: ${{ secrets.DOCKERHUB_BOT_TOKEN }}
3636

3737
- name: Login Github Container Registry
3838
id: githubContainerRegistryLogin
39-
uses: docker/login-action@v1.9.0
39+
uses: docker/login-action@v1.10.0
4040
with:
4141
registry: "ghcr.io"
4242
username: "danopstech"
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Create Release
5858
id: createRelease
59-
uses: goreleaser/goreleaser-action@v2.5.0
59+
uses: goreleaser/goreleaser-action@v2.6.1
6060
with:
6161
version: latest
6262
args: release --rm-dist

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
A [Speedtest](https://www.speedtest.net) exporter for Prometheus.
88

99
[![goreleaser](https://github.com/danopstech/speedtest_exporter/actions/workflows/release.yaml/badge.svg)](https://github.com/danopstech/speedtest_exporter/actions/workflows/release.yaml)
10+
[![build](https://github.com/danopstech/speedtest_exporter/actions/workflows/build.yaml/badge.svg)](https://github.com/danopstech/speedtest_exporter/actions/workflows/build.yaml)
1011
[![License](https://img.shields.io/github/license/danopstech/speedtest_exporter)](/LICENSE)
1112
[![Release](https://img.shields.io/github/release/danopstech/speedtest_exporter.svg)](https://github.com/danopstech/speedtest_exporter/releases/latest)
1213
[![Docker](https://img.shields.io/docker/pulls/danopstech/speedtest_exporter)](https://hub.docker.com/r/danopstech/speedtest_exporter)
1314
![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/danopstech/speedtest_exporter)
1415
![os/arch](https://img.shields.io/badge/os%2Farch-amd64-yellow)
1516
![os/arch](https://img.shields.io/badge/os%2Farch-arm64-yellow)
1617
![os/arch](https://img.shields.io/badge/os%2Farch-armv7-yellow)
17-
18-
> 📡 **[Starlink Monitoring System](https://github.com/danopstech/starlink) uses this Container.** it is a batteries included Docker Compose file to run exporters, Grafana and Prometheus.
18+
[![Go Report Card](https://goreportcard.com/badge/github.com/danopstech/speedtest_exporter)](https://goreportcard.com/report/github.com/danopstech/speedtest_exporter)
1919

2020
## Usage:
2121

‎cmd/speedtest_exporter/main.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import (
66
"net/http"
77
"time"
88

9+
"github.com/danopstech/speedtest_exporter/internal/exporter"
910
"github.com/prometheus/client_golang/prometheus"
1011
"github.com/prometheus/client_golang/prometheus/promhttp"
11-
"github.com/prometheus/common/log"
12-
13-
"github.com/danopstech/speedtest_exporter/internal/exporter"
12+
log "github.com/sirupsen/logrus"
1413
)
1514

1615
const (

0 commit comments

Comments
 (0)