From b704c6684bc289334e472aa95c75e55061c7089d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 7 Dec 2022 23:40:13 -0800 Subject: [PATCH] ci: Update [ci-force] --- Makefile | 2 +- ci/sub | 2 +- d2compiler/compile_test.go | 4 ++-- d2layouts/d2sequence/layout.go | 2 +- d2plugin/serve.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 13a440c2c..8fd431900 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: fmt gen lint build test .PHONY: fmt fmt: - prefix "$@" GOIMPORTS_LOCAL=oss.terrastruct.com, ./ci/sub/bin/fmt.sh + prefix "$@" ./ci/sub/bin/fmt.sh .PHONY: gen gen: prefix "$@" ./ci/gen.sh diff --git a/ci/sub b/ci/sub index aac1d2b9c..720467401 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit aac1d2b9c887bc48a05337dd76a44262fc936013 +Subproject commit 72046740162cff9799a94a8e1a8e4f4d7de73407 diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index b68e28644..c6cc1c25c 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -8,12 +8,12 @@ import ( tassert "github.com/stretchr/testify/assert" - "oss.terrastruct.com/util-go/assert" - "oss.terrastruct.com/util-go/diff" "oss.terrastruct.com/d2/d2compiler" "oss.terrastruct.com/d2/d2format" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" + "oss.terrastruct.com/util-go/assert" + "oss.terrastruct.com/util-go/diff" ) func TestCompile(t *testing.T) { diff --git a/d2layouts/d2sequence/layout.go b/d2layouts/d2sequence/layout.go index c6934c051..42efeb174 100644 --- a/d2layouts/d2sequence/layout.go +++ b/d2layouts/d2sequence/layout.go @@ -5,11 +5,11 @@ import ( "sort" "strings" - "oss.terrastruct.com/util-go/go2" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" ) // Layout runs the sequence diagram layout engine on objects of shape sequence_diagram diff --git a/d2plugin/serve.go b/d2plugin/serve.go index b99768e3a..b13680746 100644 --- a/d2plugin/serve.go +++ b/d2plugin/serve.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/pflag" - "oss.terrastruct.com/util-go/xmain" "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/util-go/xmain" ) // Serve returns a xmain.RunFunc that will invoke the plugin p as necessary to service the