Skip to content

fix version and dep optional #4

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
kooksee merged 2 commits into from
Jun 11, 2024
Merged

fix version and dep optional #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35b4b98
fix: 2024-06-11 15:07:32
kooksee Jun 11, 2024
5208e88
fix: 2024-06-11 15:35:02
kooksee Jun 11, 2024
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
12 changes: 10 additions & 2 deletions cmd/protobuild/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package protobuild
import (
"bytes"
"fmt"
"github.com/a8m/envsubst"
"io"
"io/fs"
"os"
Expand All @@ -12,7 +11,7 @@ import (
"strings"
"sync"

_ "github.com/a8m/envsubst"
"github.com/a8m/envsubst"
"github.com/cnf/structhash"
"github.com/pubgo/funk/assert"
"github.com/pubgo/funk/errors"
Expand Down Expand Up @@ -340,6 +339,10 @@ func Main() *cli.App {
continue
}

if pathutil.IsNotExist(url) && dep.Optional != nil && *dep.Optional {
continue
}

v := strutil.FirstFnNotEmpty(func() string {
return versions[url]
}, func() string {
Expand Down Expand Up @@ -422,6 +425,11 @@ func Main() *cli.App {
fmt.Println(url)

url = assert.Must1(filepath.Abs(url))

if pathutil.IsNotExist(url) && dep.Optional != nil && *dep.Optional {
continue
}

newUrl := filepath.Join(cfg.Vendor, dep.Name)
assert.Must(filepath.Walk(url, func(path string, info fs.FileInfo, err error) (gErr error) {
if err != nil {
Expand Down
9 changes: 5 additions & 4 deletions cmd/protobuild/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ type plugin struct {
}

type depend struct {
Name string `yaml:"name,omitempty"`
Url string `yaml:"url,omitempty"`
Path string `yaml:"path,omitempty"`
Version *string `yaml:"version,omitempty"`
Name string `yaml:"name,omitempty"`
Url string `yaml:"url,omitempty"`
Path string `yaml:"path,omitempty"`
Version *string `yaml:"version,omitempty"`
Optional *bool `yaml:"optional,omitempty"`
}
2 changes: 1 addition & 1 deletion version/version.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/pubgo/funk/assert"
)

var Version = "v0.0.1-dev"
var Version = "v0.0.20"

func init() {
if Version == "" {
Expand Down