Skip to content

Commit

Permalink
Merge 5034cd8 into 8ea97f9
Browse files Browse the repository at this point in the history
  • Loading branch information
NicholasLYang committed Sep 13, 2023
2 parents 8ea97f9 + 5034cd8 commit 15bb6b2
Show file tree
Hide file tree
Showing 96 changed files with 2,792 additions and 551 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-go/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.18
go-version: 1.19
cache: true
cache-dependency-path: cli/go.sum

Expand Down
23 changes: 19 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions cli/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ issues:
exclude-use-default: false
max-issues-per-linter: 0
max-same-issues: 0
exclude:
- "func name will be used as hash.Hash.* by other packages, and that stutters; consider calling this"
3 changes: 3 additions & 0 deletions cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ turbo:
turbo-prod:
cargo build --release --manifest-path ../crates/turborepo/Cargo.toml

turbo-capnp:
cd ../crates/turborepo-lib/src/hash && capnp compile -I std -ogo proto.capnp && mv ./proto.capnp.go ../../../../cli/internal/fs/hash/capnp

go-turbo$(EXT): $(GENERATED_FILES) $(SRC_FILES) go.mod turborepo-ffi-install
CGO_ENABLED=1 go build -tags $(GO_TAG) -o go-turbo$(EXT) ./cmd/turbo

Expand Down
33 changes: 13 additions & 20 deletions cli/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/vercel/turbo/cli

go 1.18
go 1.19

require (
capnproto.org/go/capnp/v3 v3.0.0-alpha-29
github.com/AlecAivazis/survey/v2 v2.3.5
github.com/DataDog/zstd v1.5.2
github.com/Masterminds/semver v1.5.0
github.com/adrg/xdg v0.3.3
github.com/andybalholm/crlf v0.0.0-20171020200849-670099aa064f
github.com/briandowns/spinner v1.18.1
github.com/cenkalti/backoff/v4 v4.1.3
github.com/deckarep/golang-set v1.8.0
Expand All @@ -16,14 +16,12 @@ require (
github.com/fsnotify/fsnotify v1.6.0
github.com/gobwas/glob v0.2.3
github.com/google/chrometracing v0.0.0-20210413150014-55fded0163e7
github.com/google/go-cmp v0.5.8
github.com/google/uuid v1.3.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/hashicorp/go-gatedio v0.5.0
github.com/hashicorp/go-hclog v1.2.1
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-retryablehttp v0.6.8
github.com/iseki0/go-yarnlock v0.0.2-0.20220905015017-a2a90751cdfa
github.com/karrick/godirwalk v1.16.1
github.com/mattn/go-isatty v0.0.14
github.com/mitchellh/cli v1.1.5
Expand All @@ -37,55 +35,50 @@ require (
github.com/schollz/progressbar/v3 v3.9.0
github.com/segmentio/ksuid v1.0.4
github.com/spf13/cobra v1.3.0
github.com/spf13/viper v1.12.0
github.com/stretchr/testify v1.8.0
github.com/stretchr/testify v1.8.2
github.com/yookoala/realpath v1.0.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sync v0.1.0
golang.org/x/sys v0.5.0
google.golang.org/grpc v1.46.2
google.golang.org/protobuf v1.28.0
gotest.tools/v3 v3.3.0
)

require (
github.com/google/go-cmp v0.5.8 // indirect
github.com/tinylib/msgp v1.1.8 // indirect
zenhack.net/go/util v0.0.0-20230414204917-531d38494cf5 // indirect
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/net v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 15bb6b2

Please sign in to comment.