Skip to content

Commit

Permalink
Upgraded to Go 1.20, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
rykov committed Apr 8, 2023
1 parent 1a8baf8 commit 689348d
Show file tree
Hide file tree
Showing 5 changed files with 122 additions and 104 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
-
Expand All @@ -32,9 +32,9 @@ jobs:
yarn run build
-
name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version: '1.20'
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,10 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v4
with:
go-version: 1.17
- name: Cache modules
uses: actions/cache@v2
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- name: Download modules
if: steps.cache.outputs.cache-hit != 'true'
run: go mod download
go-version: '~1.20.0'
- name: Run tests
run: go test ./...
6 changes: 4 additions & 2 deletions config/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ func (f *Fs) FindListPath(name string) string {
return f.findFileWithExtension(paths, listExts)
}

/* This will look through all paths, match them with all extensions
and return the first one it finds that exists */
/*
This will look through all paths, match them with all extensions
and return the first one it finds that exists
*/
func (f *Fs) findFileWithExtension(paths, exts []string) string {
for _, p := range paths {
if f.IsFile(p) {
Expand Down
55 changes: 28 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,61 +1,62 @@
module github.com/rykov/paperboy

go 1.18
go 1.20

require (
github.com/PuerkitoBio/goquery v1.8.0
github.com/PuerkitoBio/goquery v1.8.1
github.com/bep/inflect v0.0.0-20160408190323-b896c45f5af9
github.com/cenkalti/backoff/v4 v4.1.3
github.com/charmbracelet/glamour v0.5.0
github.com/cenkalti/backoff/v4 v4.2.0
github.com/charmbracelet/glamour v0.6.0
github.com/chris-ramon/douceur v0.2.0
github.com/ghodss/yaml v1.0.0
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
github.com/google/go-cmp v0.5.8
github.com/graph-gophers/graphql-go v1.4.0
github.com/google/go-cmp v0.5.9
github.com/graph-gophers/graphql-go v1.5.0
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
github.com/jtacoma/uritemplates v1.0.0
github.com/microcosm-cc/bluemonday v1.0.19
github.com/microcosm-cc/bluemonday v1.0.23
github.com/pelletier/go-toml v1.9.5
github.com/rs/cors v1.8.2
github.com/sirupsen/logrus v1.8.1
github.com/spf13/afero v1.8.2
github.com/rs/cors v1.8.3
github.com/sirupsen/logrus v1.9.0
github.com/spf13/afero v1.9.5
github.com/spf13/cast v1.5.0
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.12.0
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.15.0
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208
github.com/yuin/goldmark v1.4.13
golang.org/x/net v0.0.0-20220708220712-1185a9018129
github.com/yuin/goldmark v1.5.4
golang.org/x/net v0.9.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/andybalholm/cascadia v1.3.1 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/dlclark/regexp2 v1.9.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-test/deep v1.0.8 // indirect
github.com/gorilla/css v1.0.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.18 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.12.0 // indirect
github.com/muesli/termenv v0.15.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/yuin/goldmark-emoji v1.0.1 // indirect
golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/text v0.9.0 // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 689348d

Please sign in to comment.