Skip to content

Commit

Permalink
chore: bump go version, bump dependencies, remove travis (#16)
Browse files Browse the repository at this point in the history
* chore: bump go version, bump dependencies, remove travis

* chore: Add GitHub actions

* chore: bump version, remove fixed versions everywhere
  • Loading branch information
carstendietrich authored Jun 8, 2022
1 parent 07be859 commit b3543ec
Show file tree
Hide file tree
Showing 14 changed files with 1,018 additions and 420 deletions.
53 changes: 53 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Tests

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
tests:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.18', '1.*' ]
name: Tests
steps:
- uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go }}
- name: Get dependencies
run: go get -v -t -d ./...
- name: Test
run: CGO_ENABLED=1 go test -race ./...
static-checks:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.*' ]
name: Static checks
steps:
- uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go }}
- name: Get dependencies
run: go get -v -t -d ./...
- name: Go Vet
run: go vet ./...
- name: Go Fmt
run: |
fmt=$(gofmt -l .)
test -z $fmt || (echo "please run gofmt" ; echo $fmt ; exit 1)
- name: Go Staticcheck
run: go run honnef.co/go/tools/cmd/staticcheck@latest ./...
- name: Goimports
run: |
go run golang.org/x/tools/cmd/goimports@latest -w .
git diff --quiet || (echo 'goimports requires code cleanup:' ; git diff ; exit 1)
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
VERSION=2.1.3
VERSION=2.2.0

.PHONY: docker dockerpublish test
.PHONY: docker dockerpublish test run run-demo

default: test

run:
go run vistecture-dashboard.go

run-demo:
go run vistecture-dashboard.go -config=example/project.yml -Demo

test:
go test -vet=all ./...

Expand Down
6 changes: 3 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ Works together with [Vistecture](https://github.com/aoepeople/vistecture) and sh

## Usage ##

You can use the Dockerimage: `aoepeople/vistecture-dashboard:2.1.3`
You can use the Dockerimage: `aoepeople/vistecture-dashboard`

### Example Project

```
docker run --rm -ti -p 8080:8080 aoepeople/vistecture-dashboard:2.1.3
docker run --rm -ti -p 8080:8080 aoepeople/vistecture-dashboard
```

### Custom Project
Expand All @@ -23,7 +23,7 @@ Just copy your vistecture definitions into /vistecture/project.yml
The following Dockerfile could be used to build an image running the dashboard for your defined architecture:

```dockerfile
FROM aoepeople/vistecture-dashboard:2.1.3
FROM aoepeople/vistecture-dashboard

COPY definition /definition
CMD ["-config", "/definition/project.yml"]
Expand Down
2 changes: 1 addition & 1 deletion example/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM aoepeople/vistecture-dashboard:2.1.3
FROM aoepeople/vistecture-dashboard
COPY . /definition
CMD ["-config", "/definition/project.yml"]
65 changes: 52 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,58 @@
module github.com/AOEpeople/vistecture-dashboard/v2

go 1.13
go 1.18

require (
github.com/AOEpeople/vistecture/v2 v2.0.10
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
github.com/imdario/mergo v0.3.8 // indirect
github.com/AOEpeople/vistecture/v2 v2.5.2
github.com/prometheus/client_golang v1.12.2
k8s.io/api v0.24.1
k8s.io/apimachinery v0.24.1
k8s.io/client-go v0.24.1
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/prometheus/client_golang v0.8.0
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 // indirect
github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 // indirect
github.com/prometheus/procfs v0.0.0-20180408092902-8b1c2da0d56d // indirect
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
k8s.io/api v0.17.0
k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Loading

0 comments on commit b3543ec

Please sign in to comment.