Skip to content

Commit

Permalink
Merge pull request #24 from MrDOS/improvement/bump-dependencies
Browse files Browse the repository at this point in the history
Bump dependencies & CI improvements
  • Loading branch information
bzz committed Oct 11, 2022
2 parents f697390 + f6b5690 commit 18a439e
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 87 deletions.
16 changes: 7 additions & 9 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Run GolangCI-Lint
uses: golangci/golangci-lint-action@v2
- uses: actions/setup-go@v3
with:
version: v1.47.0

- name: Test
run: go test ./...
go-version: '>=1.17.0'
- uses: actions/checkout@v3
- uses: golangci/golangci-lint-action@v3
with:
version: latest
only-new-issues: true
4 changes: 2 additions & 2 deletions .github/workflows/race.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v1
uses: actions/setup-go@v3
with:
go-version: 1.16.x
go-version: '1.17'
- name: Checkout code
uses: actions/checkout@v2
- name: Test race
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ jobs:
project_path: cmd/license-detector
binary_name: license-detector
github_token: ${{ secrets.GITHUB_TOKEN }}
goversion: '1.17'
goos: ${{ matrix.goos }}
goarch: amd64
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.16.x, 1.17.x]
# Oldest supported and latest available. Anything in between should not
# fail in ways that the newest does not also.
go-version: ['1.17', '1.19']
platform: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
uses: actions/setup-go@v1
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}

Expand Down
60 changes: 38 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,32 +1,48 @@
module github.com/go-enry/go-license-detector/v4

go 1.16
go 1.17

require (
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
github.com/dgryski/go-minhash v0.0.0-20170608043002-7fe510aff544 // indirect
github.com/dgryski/go-spooky v0.0.0-20170606183049-ed3d087f40e2 // indirect
github.com/ekzhu/minhash-lsh v0.0.0-20171225071031-5c06ee8586a1
github.com/go-git/go-git/v5 v5.1.0
github.com/ekzhu/minhash-lsh v0.0.0-20190924033628-faac2c6342f8
github.com/go-git/go-git/v5 v5.4.2
github.com/hhatto/gorst v0.0.0-20181029133204-ca9f730cac5b
github.com/jdkato/prose v1.1.0
github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb // indirect
github.com/neurosnap/sentences v1.0.6 // indirect
github.com/jdkato/prose v1.2.1
github.com/pkg/errors v0.9.1
github.com/russross/blackfriday/v2 v2.0.1
github.com/sergi/go-diff v1.1.0
github.com/shogo82148/go-shuffle v0.0.0-20170808115208-59829097ff3b // indirect
github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect
github.com/russross/blackfriday/v2 v2.1.0
github.com/sergi/go-diff v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.0
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2
golang.org/x/net v0.0.0-20200301022130-244492dfa37a
golang.org/x/text v0.3.6
gonum.org/v1/gonum v0.7.0
gopkg.in/neurosnap/sentences.v1 v1.0.6 // indirect
github.com/stretchr/testify v1.8.0
golang.org/x/exp v0.0.0-20221006183845-316c7553db56
golang.org/x/net v0.0.0-20221004154528-8021a29435af
golang.org/x/text v0.3.7
gonum.org/v1/gonum v0.8.2
)

replace (
github.com/sergi/go-diff v1.0.0 => github.com/sergi/go-diff v0.0.0-20180205163309-da645544ed44
golang.org/x/text v0.3.2 => golang.org/x/text v0.3.0
require (
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20220930113650-c6815a8c17ad // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/cloudflare/circl v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
github.com/dgryski/go-minhash v0.0.0-20190315135803-ad340ca03076 // indirect
github.com/dgryski/go-spooky v0.0.0-20170606183049-ed3d087f40e2 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.1 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/montanaflynn/stats v0.6.6 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/shogo82148/go-shuffle v1.0.1 // indirect
github.com/xanzy/ssh-agent v0.3.2 // indirect
golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
golang.org/x/tools v0.1.12 // indirect
gopkg.in/neurosnap/sentences.v1 v1.0.7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

0 comments on commit 18a439e

Please sign in to comment.