Skip to content

Commit

Permalink
Merge pull request #8 from osspkg/develop
Browse files Browse the repository at this point in the history
upgrade + change organization
  • Loading branch information
markus621 authored Jun 14, 2023
2 parents 6cc6d08 + bf68088 commit 8464352
Show file tree
Hide file tree
Showing 15 changed files with 176 additions and 64 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

version: 2
updates:
- package-ecosystem: "gomod" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

name: CI

on:
Expand All @@ -11,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [ '1.17', '1.18', '1.19', '1.20' ]
go: [ '1.17', '1.18', '1.19' ]
steps:
- uses: actions/checkout@v3

Expand All @@ -23,4 +24,4 @@ jobs:
- name: Run CI
env:
COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
run: make ci
run: make ci
38 changes: 38 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
schedule:
- cron: '16 8 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
19 changes: 10 additions & 9 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# options for analysis running
run:
# timeout for analysis, e.g. 30s, 5m, default is 1m
Expand All @@ -17,9 +18,9 @@ run:
- easyjson

issues:
# Independently from option `exclude` we use default exclude patterns,
# Independently from option 'exclude' we use default exclude patterns,
# it can be disabled by this option. To list all
# excluded by default patterns execute `golangci-lint run --help`.
# excluded by default patterns execute 'golangci-lint run --help'.
# Default value for this option is true.
exclude-use-default: false
# Excluding configuration per-path, per-linter, per-text and per-source
Expand Down Expand Up @@ -121,13 +122,13 @@ linters-settings:
# find structs that would use less memory if their fields were sorted
- fieldalignment
gofmt:
# simplify code: gofmt with `-s` option, true by default
# simplify code: gofmt with '-s' option, true by default
simplify: true
errcheck:
# report about not checking of errors in type assetions: `a := b.(MyStruct)`;
# report about not checking of errors in type assetions: 'a := b.(MyStruct)';
# default is false: such cases aren't reported by default.
check-type-assertions: true
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
# report about assignment of errors to blank identifier: 'num, _ := strconv.Atoi(numStr)';
# default is false: such cases aren't reported by default.
check-blank: true
gocyclo:
Expand Down Expand Up @@ -155,8 +156,8 @@ linters-settings:
gci:
# Section configuration to compare against.
# Section names are case-insensitive and may contain parameters in ().
# The default order of sections is `standard > default > custom > blank > dot`,
# If `custom-order` is `true`, it follows the order of `sections` option.
# The default order of sections is 'standard > default > custom > blank > dot',
# If 'custom-order' is 'true', it follows the order of 'sections' option.
# Default: ["standard", "default"]
#sections:
#- standard # Standard section: captures all standard packages.
Expand All @@ -167,7 +168,7 @@ linters-settings:
# Default: true
skip-generated: true
# Enable custom order of sections.
# If `true`, make the section order the same as the order of `sections`.
# If 'true', make the section order the same as the order of 'sections'.
# Default: false
custom-order: false
gosec:
Expand Down Expand Up @@ -371,4 +372,4 @@ linters:
- gci
- gosec
- lll
fast: false
fast: false
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# devtool

[![Release](https://img.shields.io/github/release/dewep-online/devtool.svg?style=flat-square)](https://github.com/dewep-online/devtool/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/dewep-online/devtool)](https://goreportcard.com/report/github.com/dewep-online/devtool)
[![CI](https://github.com/dewep-online/devtool/actions/workflows/ci.yml/badge.svg)](https://github.com/dewep-online/devtool/actions/workflows/ci.yml)
[![Release](https://img.shields.io/github/release/osspkg/devtool.svg?style=flat-square)](https://github.com/osspkg/devtool/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/osspkg/devtool)](https://goreportcard.com/report/github.com/osspkg/devtool)
[![CI](https://github.com/osspkg/devtool/actions/workflows/ci.yml/badge.svg)](https://github.com/osspkg/devtool/actions/workflows/ci.yml)

_A utility with a set of commands for performing CI and setting up a project_

# Install

```bash
go install github.com/dewep-online/devtool@latest
go install github.com/osspkg/devtool@latest
```

## License
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/dewep-online/devtool
module github.com/osspkg/devtool

go 1.17

require github.com/deweppro/go-sdk v1.2.3
require github.com/osspkg/go-sdk v1.2.5
19 changes: 11 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/deweppro/go-algorithms v1.2.1/go.mod h1:VW0wmlJiXEw+TVEAtWDr+P7Zg9IocCmkS8VSIDoDHlc=
github.com/deweppro/go-sdk v1.2.3 h1:HHXaJfcEqIu20OvmtqyDbJ+yfhA9iYZx2al7W4CdHvk=
github.com/deweppro/go-sdk v1.2.3/go.mod h1:n3GwnifwLv2s1KdOe04Rsu52uniiL2cWsa77YkXGKVQ=
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
Expand All @@ -13,19 +10,21 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/osspkg/go-algorithms v1.2.2/go.mod h1:Zdclm/CKhDrUD34kIm9PL4VDbiey/jXAHY36nfc0r5Q=
github.com/osspkg/go-sdk v1.2.5 h1:zeef6s8dg/sRyOVRyARksaREX+TY2PZtBcdD2m/SQss=
github.com/osspkg/go-sdk v1.2.5/go.mod h1:7gGXipcTc2sB+EzmBUSz5poGs6wM/xXnwCZBMKrIzD8=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
Expand All @@ -34,7 +33,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -45,16 +45,19 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
Expand Down
8 changes: 4 additions & 4 deletions internal/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package build
import (
"strings"

"github.com/dewep-online/devtool/internal/global"
"github.com/dewep-online/devtool/pkg/exec"
"github.com/dewep-online/devtool/pkg/files"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/devtool/internal/global"
"github.com/osspkg/devtool/pkg/exec"
"github.com/osspkg/devtool/pkg/files"
"github.com/osspkg/go-sdk/console"
)

func Cmd() console.CommandGetter {
Expand Down
4 changes: 2 additions & 2 deletions internal/global/global.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os/exec"
"regexp"

"github.com/dewep-online/devtool/pkg/files"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/devtool/pkg/files"
"github.com/osspkg/go-sdk/console"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions internal/lint/lint.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package lint

import (
"github.com/dewep-online/devtool/internal/global"
"github.com/dewep-online/devtool/pkg/exec"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/devtool/internal/global"
"github.com/osspkg/devtool/pkg/exec"
"github.com/osspkg/go-sdk/console"
)

func Cmd() console.CommandGetter {
Expand Down
Loading

0 comments on commit 8464352

Please sign in to comment.