Skip to content

Move to Go 1.17 #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbrt merged 5 commits into from
Nov 7, 2021
Merged

Move to Go 1.17 #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3095c7
Upgrade min go version to 1.17.
mbrt Nov 6, 2021
8fbf15c
Use go embed instead of go-bindata.
mbrt Nov 7, 2021
d6e4f11
Drop the codegen test.
mbrt Nov 7, 2021
16b7136
Introduce engine package grouping.
mbrt Nov 7, 2021
cbb9f05
Fix lint errors.
mbrt Nov 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ jobs:
version: v1.34

- name: Test
run: |
go test -v ./...
hack/check-codegen.sh
run: go test -v ./...

- name: Coverage
id: coverage
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl-config-migrate/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/mbrt/gmailctl/cmd/gmailctl-config-migrate/v1alpha1"
"github.com/mbrt/gmailctl/cmd/gmailctl-config-migrate/v1alpha2"
"github.com/mbrt/gmailctl/cmd/gmailctl-config-migrate/v1alpha3"
"github.com/mbrt/gmailctl/internal/rimport"
"github.com/mbrt/gmailctl/internal/engine/rimport"
)

const header = `// This file is generated by gmailctl-config-migrate.
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl-config-migrate/v1alpha1/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha1

import (
"github.com/mbrt/gmailctl/internal/gmail"
"github.com/mbrt/gmailctl/internal/engine/gmail"
)

// Version is the config format version supported by this package.
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl-config-migrate/v1alpha2/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/mbrt/gmailctl/cmd/gmailctl-config-migrate/v1alpha1"
"github.com/mbrt/gmailctl/internal/gmail"
"github.com/mbrt/gmailctl/internal/engine/gmail"
)

// Version is the latest supported version.
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl-config-migrate/v1alpha3/alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package v1alpha3

import cfg "github.com/mbrt/gmailctl/internal/config/v1alpha3"
import cfg "github.com/mbrt/gmailctl/internal/engine/config/v1alpha3"

// Config is an alias pointing to the actual v1alpha3.Config type.
type Config = cfg.Config
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl-config-migrate/v1alpha3/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/hashicorp/go-multierror"

"github.com/mbrt/gmailctl/cmd/gmailctl-config-migrate/v1alpha2"
"github.com/mbrt/gmailctl/internal/config/v1alpha3"
"github.com/mbrt/gmailctl/internal/engine/config/v1alpha3"
)

var dummyFilter = v1alpha3.FilterNode{}
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl-config-migrate/v1alpha3/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"gopkg.in/yaml.v2"

"github.com/mbrt/gmailctl/cmd/gmailctl-config-migrate/v1alpha2"
"github.com/mbrt/gmailctl/internal/config/v1alpha3"
"github.com/mbrt/gmailctl/internal/engine/config/v1alpha3"
)

func read(path string) []byte {
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl/cmd/api_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"google.golang.org/api/gmail/v1"

"github.com/mbrt/gmailctl/internal/api"
"github.com/mbrt/gmailctl/internal/engine/api"
)

// APIProvider is the APIProvider used by all gmailctl commands.
Expand Down
2 changes: 1 addition & 1 deletion cmd/gmailctl/cmd/apply_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/spf13/cobra"

papply "github.com/mbrt/gmailctl/internal/apply"
papply "github.com/mbrt/gmailctl/internal/engine/apply"
"github.com/mbrt/gmailctl/internal/errors"
)

Expand Down
273 changes: 0 additions & 273 deletions cmd/gmailctl/cmd/bindata.go
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions cmd/gmailctl/cmd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os"
"path"

papply "github.com/mbrt/gmailctl/internal/apply"
"github.com/mbrt/gmailctl/internal/cfgtest"
"github.com/mbrt/gmailctl/internal/config"
"github.com/mbrt/gmailctl/internal/config/v1alpha3"
papply "github.com/mbrt/gmailctl/internal/engine/apply"
"github.com/mbrt/gmailctl/internal/engine/cfgtest"
"github.com/mbrt/gmailctl/internal/engine/config"
"github.com/mbrt/gmailctl/internal/engine/config/v1alpha3"
)

type parseResult struct {
Expand Down
13 changes: 0 additions & 13 deletions cmd/gmailctl/cmd/data.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/gmailctl/cmd/debug_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"

"github.com/mbrt/gmailctl/internal/filter"
"github.com/mbrt/gmailctl/internal/engine/filter"
)

var (
Expand Down
Loading