Merge pull request #74 from Luzilla/chore-update

Chore: "luzilla" vs "Luzilla"

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 # DRY
 x_ref:
   docker_golang: &docker_golang
-    image: circleci/golang:1.12
+    image: circleci/golang:1.16
   docker_goreleaser: &docker_goreleaser
     image: goreleaser/goreleaser
   work_dir: &work_dir
@@ -12,23 +12,12 @@ x_ref:
 workflows:
   pr:
     jobs:
-      - test
-      - build:
-          requires:
-            - test
+      - build
       - integration:
           requires:
             - build
 
 jobs:
-  test:
-    <<: *work_dir
-    docker:
-      - *docker_golang
-    steps:
-      - checkout
-      - run: go mod download
-      - run: go test ./...
   build:
     <<: *work_dir
     docker:

.github/workflows/pr.yml

@@ -0,0 +1,47 @@
+name: pr
+
+on:
+  pull_request:
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.14.x, 1.15.x, 1.16.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Setup Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: ${{ matrix.go-version }}
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Test
+      run: go test ./...
+
+  snapshot:
+    runs-on: ubuntu-latest
+    needs:
+      - test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist --snapshot
+      - name: Copy .ini files
+        run: cp targets.ini rbls.ini ./dist/dnsbl_exporter_linux_amd64
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: dnsbl_exporter
+          path: dist/dnsbl_exporter_linux_amd64

.gitignore

@@ -1 +1,2 @@
 dist
+vendor

Makefile

@@ -1,3 +1,13 @@
 .PHONY: build
 build:
 	goreleaser --snapshot --rm-dist
+
+.PHONY: test
+test:
+	docker run \
+		-it \
+		--rm \
+		-v $(CURDIR):/src/github.com/Luzilla/dnsbl_exporter \
+		-w /src/github.com/Luzilla/dnsbl_exporter \
+		golang:1.16 \
+		sh -c "go mod download && go test ./..."

README.md

@@ -1,6 +1,6 @@
 # dnsbl-exporter
 
-[![CircleCI](https://circleci.com/gh/Luzilla/dnsbl_exporter.svg?style=svg)](https://circleci.com/gh/Luzilla/dnsbl_exporter) [![Maintainability](https://api.codeclimate.com/v1/badges/31b95e6c679f60e30bea/maintainability)](https://codeclimate.com/github/Luzilla/dnsbl_exporter/maintainability)
+[![CircleCI](https://circleci.com/gh/Luzilla/dnsbl_exporter.svg?style=svg)](https://circleci.com/gh/Luzilla/dnsbl_exporter) [![pr](https://github.com/Luzilla/dnsbl_exporter/actions/workflows/pr.yml/badge.svg)](https://github.com/Luzilla/dnsbl_exporter/actions/workflows/pr.yml) [![Maintainability](https://api.codeclimate.com/v1/badges/31b95e6c679f60e30bea/maintainability)](https://codeclimate.com/github/Luzilla/dnsbl_exporter/maintainability)
 
 This is a server which checks the configured hosts against various DNSBL (sometimes refered to as RBLs).
 

dnsbl_exporter.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/luzilla/dnsbl_exporter/collector"
-	"github.com/luzilla/dnsbl_exporter/config"
+	"github.com/Luzilla/dnsbl_exporter/collector"
+	"github.com/Luzilla/dnsbl_exporter/config"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/urfave/cli"
 

go.mod

@@ -1,6 +1,6 @@
-module github.com/luzilla/dnsbl_exporter
+module github.com/Luzilla/dnsbl_exporter
 
-go 1.12
+go 1.16
 
 require github.com/prometheus/client_golang v1.9.0