Skip to content
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.

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

Update shared go packages after package splitting #578

Merged
merged 5 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
repo: pulumi/crd2pulumi
tag: v1.5.4

- run: make bin/devops
- run: make bin/devctl
- run: make build
- run: make test

Expand Down
1 change: 1 addition & 0 deletions .versions/devctl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.1.2
19 changes: 10 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ FIND := gfind
endif

LOCALBIN := ${WORKING_DIR}/bin
DEVOPS := ${LOCALBIN}/devops
DEVCTL := ${LOCALBIN}/devctl
BUF := ${LOCALBIN}/buf
GINKGO := ${LOCALBIN}/ginkgo
GOLANGCI := ${LOCALBIN}/golangci-lint

export PATH := ${LOCALBIN}:${PATH}

GO_SRC := $(shell $(DEVOPS) list --go)
TS_SRC := $(shell $(DEVOPS) list --ts)
PROTO_SRC := $(shell $(DEVOPS) list --proto)
GO_SRC := $(shell $(DEVCTL) list --go)
TS_SRC := $(shell $(DEVCTL) list --ts)
PROTO_SRC := $(shell $(DEVCTL) list --proto)
GO_PB_SRC ?= ${PROTO_SRC:proto/%.proto=pkg/%.pb.go}

GO_SUITES ?= $(filter %_suite_test.go,${GO_SRC})
Expand Down Expand Up @@ -66,20 +66,21 @@ packages/%/dist:
$(GO_SRC:%.go=%_test.go): %_test.go: | bin/ginkgo
cd $(dir $@) && $(GINKGO) generate $(notdir $*)

bin/ux: $(shell $(DEVOPS) list --go --exclude-tests)
bin/ux: $(shell $(DEVCTL) list --go --exclude-tests)
go -C cmd/ux build -o ${WORKING_DIR}/$@

bin/uml2uml: cmd/uml2uml/main.go
go -C cmd/uml2uml build -o ${WORKING_DIR}/$@

bin/uml2ts: $(shell $(DEVOPS) list --ts --exclude-tests)
bin/uml2ts: $(shell $(DEVCTL) list --ts --exclude-tests)
bun build --cwd packages/uml2ts index.ts --compile --outfile ${WORKING_DIR}/$@

bin/zod2uml: $(shell $(DEVOPS) list --ts --exclude-tests)
bin/zod2uml: $(shell $(DEVCTL) list --ts --exclude-tests)
bun build --cwd packages/zod2uml index.ts --compile --outfile ${WORKING_DIR}/$@

bin/devops: $(shell $(DEVOPS) list --go --exclude-tests)
GOBIN=${LOCALBIN} go install github.com/unmango/go/cmd/devops
bin/devctl: .versions/devctl
GOBIN=${LOCALBIN} go install github.com/unmango/devctl/cmd@v$(shell cat $<)
mv ${LOCALBIN}/cmd $@

bin/buf: .versions/buf
GOBIN=${LOCALBIN} go install github.com/bufbuild/buf/cmd/buf@v$(shell cat $<)
Expand Down
2 changes: 1 addition & 1 deletion cmd/ux/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/onsi/gomega/gbytes"
"github.com/onsi/gomega/gexec"
"github.com/spf13/afero"
. "github.com/unmango/go/testing/matcher"
. "github.com/unmango/aferox/testing/gfs"

"github.com/unstoppablemango/tdl/pkg/conform"
"github.com/unstoppablemango/tdl/pkg/gen/cli"
Expand Down
1 change: 1 addition & 0 deletions cmd/ux/ux_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/spf13/afero"

"github.com/unstoppablemango/tdl/internal/util"
"github.com/unstoppablemango/tdl/pkg/conform"
"github.com/unstoppablemango/tdl/pkg/testing/e2e"
Expand Down
15 changes: 7 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/unstoppablemango/tdl

go 1.23.2
go 1.23.4

require (
connectrpc.com/connect v1.18.1
Expand All @@ -17,7 +17,8 @@ require (
github.com/spf13/afero v1.12.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/unmango/go v0.1.0
github.com/unmango/aferox v0.1.1
github.com/unmango/go v0.2.2
google.golang.org/protobuf v1.36.3
gopkg.in/yaml.v3 v3.0.1
)
Expand Down Expand Up @@ -64,7 +65,7 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/goware/urlx v0.3.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down Expand Up @@ -110,10 +111,8 @@ require (
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel v1.33.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.opentelemetry.io/otel/trace v1.33.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e // indirect
Expand All @@ -124,9 +123,9 @@ require (
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.28.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
google.golang.org/grpc v1.67.3 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250102185135-69823020774d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
google.golang.org/grpc v1.69.2 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gotest.tools/v3 v3.5.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
Expand Down
Loading
Loading