From 4745ad8753e767134ce2a96179e7c76cd0c2a3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wysoki=C5=84ski?= Date: Sun, 4 Sep 2022 10:02:07 +0200 Subject: [PATCH] refactor: rename module github.com/Kichiyaki/gootp -> gitea.dwysokinski.me/Kichiyaki/gootp --- .drone.yml | 57 ++++++++++++++++++++++++++++++++++++++++ .github/workflows/pr.yml | 55 -------------------------------------- go.mod | 4 +-- go.sum | 14 ---------- internal/andotp_test.go | 2 +- main.go | 2 +- renovate.json | 11 +++++++- 7 files changed, 71 insertions(+), 74 deletions(-) create mode 100644 .drone.yml delete mode 100644 .github/workflows/pr.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..416cf62 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,57 @@ +--- +kind: pipeline +type: docker +name: test + +steps: + - name: test + image: golang:1.19 + commands: + - make generate + - go test -race -coverprofile=coverage.txt -covermode=atomic ./... + +trigger: + event: + - push + - pull_request + branch: + - master + +--- +kind: pipeline +type: docker +name: check-go-mod + +steps: + - name: check go.mod + image: golang:1.19 + commands: + - make generate + - go mod tidy + - git diff --exit-code go.mod + +trigger: + event: + - push + - pull_request + branch: + - master + +--- +kind: pipeline +type: docker +name: golangci-lint + +steps: + - name: run golangci-lint + image: golangci/golangci-lint:v1.49 + commands: + - make generate + - golangci-lint run + +trigger: + event: + - push + - pull_request + branch: + - master diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml deleted file mode 100644 index 57c349b..0000000 --- a/.github/workflows/pr.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: PR checks -on: - push: - branches: - - master - pull_request: - -env: - GO_VERSION: 1.18.x - -jobs: - go-mod: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: ${{ env.GO_VERSION }} - - name: Check go mod - run: | - go mod tidy - git diff --exit-code go.mod - - golangci-lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: ${{ env.GO_VERSION }} - - name: Run golangci-lint - uses: golangci/golangci-lint-action@v3 - with: - version: v1.46 - - tests: - strategy: - matrix: - go: [ 1.18.x ] - platform: [ ubuntu-latest ] - runs-on: ${{ matrix.platform }} - steps: - - uses: actions/checkout@v3 - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: ${{ matrix.go }} - - name: Run go vet - run: go vet ./... - - name: Run go build - run: go build - - name: Run tests - run: go test -race -coverprofile=coverage.txt -covermode=atomic ./... diff --git a/go.mod b/go.mod index e5f1fa1..88d9921 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/Kichiyaki/gootp +module gitea.dwysokinski.me/Kichiyaki/gootp -go 1.18 +go 1.19 require ( github.com/charmbracelet/bubbles v0.13.0 diff --git a/go.sum b/go.sum index 5f2cfff..3948a71 100644 --- a/go.sum +++ b/go.sum @@ -2,11 +2,8 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/charmbracelet/bubbles v0.11.0 h1:fBLyY0PvJnd56Vlu5L84JJH6f4axhgIJ9P3NET78f0Q= -github.com/charmbracelet/bubbles v0.11.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc= github.com/charmbracelet/bubbles v0.13.0 h1:zP/ROH3wJEBqZWKIsD50ZKKlx3ydLInq3LdD/Nrlb8w= github.com/charmbracelet/bubbles v0.13.0/go.mod h1:bbeTiXwPww4M031aGi8UK2HT9RDWoiNibae+1yCMtcc= -github.com/charmbracelet/bubbletea v0.21.0 h1:f3y+kanzgev5PA916qxmDybSHU3N804uOnKnhRPXTcI= github.com/charmbracelet/bubbletea v0.21.0/go.mod h1:GgmJMec61d08zXsOhqRC/AiOx4K4pmz+VIcRIm1FKr4= github.com/charmbracelet/bubbletea v0.22.0 h1:E1BTNSE3iIrq0G0X6TjGAmrQ32cGCbFDPcIuImikrUc= github.com/charmbracelet/bubbletea v0.22.0/go.mod h1:aoVIwlNlr5wbCB26KhxfrqAn0bMp4YpJcoOelbxApjs= @@ -15,8 +12,6 @@ github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DA github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -33,7 +28,6 @@ github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= -github.com/muesli/cancelreader v0.2.0 h1:SOpr+CfyVNce341kKqvbhhzQhBPyJRXQaCtn03Pae1Q= github.com/muesli/cancelreader v0.2.0/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/muesli/cancelreader v0.2.1 h1:Xzd1B4U5bWQOuSKuN398MyynIGTNT89dxzpEDsalXZs= github.com/muesli/cancelreader v0.2.1/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= @@ -56,14 +50,8 @@ github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/urfave/cli/v2 v2.8.1 h1:CGuYNZF9IKZY/rfBe3lJpccSoIY1ytfvmgQT90cNOl4= -github.com/urfave/cli/v2 v2.8.1/go.mod h1:Z41J9TPoffeoqP0Iza0YbAhGvymRdZAd2uPmZ5JxRdY= -github.com/urfave/cli/v2 v2.10.1 h1:34qJSQxqF/4fqJ7oiAV5WoXaTFlGG9QNM+qxpY3W3gs= -github.com/urfave/cli/v2 v2.10.1/go.mod h1:MaQ2eKodtz1fFzu2U0jL+tVjoWmG134POMRjyXJK6+8= github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo= github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= @@ -81,7 +69,5 @@ golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqn golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/andotp_test.go b/internal/andotp_test.go index 5c02427..758f9dd 100644 --- a/internal/andotp_test.go +++ b/internal/andotp_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/Kichiyaki/gootp/internal" + "gitea.dwysokinski.me/Kichiyaki/gootp/internal" "github.com/stretchr/testify/assert" ) diff --git a/main.go b/main.go index 5922b24..9f9f3b1 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( tea "github.com/charmbracelet/bubbletea" - "github.com/Kichiyaki/gootp/internal" + "gitea.dwysokinski.me/Kichiyaki/gootp/internal" "github.com/urfave/cli/v2" "golang.org/x/term" ) diff --git a/renovate.json b/renovate.json index f45d8f1..b20b188 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,14 @@ { + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "labels": [ + "dependencies" + ], "extends": [ - "config:base" + "config:base", + ":semanticCommits", + ":semanticCommitTypeAll(chore)" + ], + "postUpdateOptions": [ + "gomodTidy" ] }