Skip to content
This repository has been archived by the owner on Dec 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #67 from vania-pooh/master
Browse files Browse the repository at this point in the history
Go and dependency updates
  • Loading branch information
vania-pooh authored Jan 7, 2024
2 parents 1c1267b + c160231 commit 283b5b4
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 170 deletions.
19 changes: 0 additions & 19 deletions .github/stale.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.15.x
go-version: 1.21.5

- uses: actions/cache@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.15.x
go-version: 1.21.5

- uses: actions/cache@v1
with:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: 'Close stale issues and PRs'
on:
schedule:
- cron: '30 1 * * *'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
days-before-stale: 60
days-before-close: 7
stale-issue-label: stale
exempt-issue-labels:
- new-feature
- bug
- improvement
- docs
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.15.x
go-version: 1.21.5

- uses: actions/cache@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.12
FROM alpine:3

RUN apk add -U tzdata ca-certificates && rm -Rf /var/cache/apk/*
COPY ggr-ui /usr/bin
Expand Down
2 changes: 1 addition & 1 deletion ci/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export GO111MODULE="on"
go get -u github.com/mitchellh/gox # cross compile
go install github.com/mitchellh/gox@latest # cross compile
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "-X main.buildStamp=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.gitRevision=`git describe --tags || git rev-parse HEAD` -s -w"
gox -os "linux darwin windows" -arch "amd64" -osarch="windows/386" -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags "-X main.buildStamp=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.gitRevision=`git describe --tags || git rev-parse HEAD` -s -w"
3 changes: 3 additions & 0 deletions ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@

export GO111MODULE="on"
go test -tags 'watch' -v -race -coverprofile=coverage.txt -covermode=atomic

go install golang.org/x/vuln/cmd/govulncheck@latest
"$(go env GOPATH)"/bin/govulncheck -tags production ./...
20 changes: 16 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
module github.com/aerokube/ggr-ui

go 1.15
go 1.21

require (
github.com/aandryashin/reloader v0.0.0-20161127125235-da4f1b43ce40
github.com/aerokube/ggr v0.0.0-20181018070727-08e778c741ca
github.com/prometheus/client_golang v1.11.1
golang.org/x/net v0.0.0-20200625001655-4c5254603344
github.com/aerokube/ggr v0.0.0-20240107091226-64e83db61680
github.com/prometheus/client_golang v1.18.0
golang.org/x/net v0.19.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
golang.org/x/sys v0.15.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
168 changes: 26 additions & 142 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 283b5b4

Please sign in to comment.