From 0847be39d34a0b943138110417e800c7c7796b8c Mon Sep 17 00:00:00 2001 From: Alex Shtin Date: Wed, 15 Jul 2020 16:00:53 -0700 Subject: [PATCH] Fix merge errors (#42) --- ctxpropagation/starter/main.go | 2 +- ctxpropagation/workflow_test.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ctxpropagation/starter/main.go b/ctxpropagation/starter/main.go index 7497be96..faa61a18 100644 --- a/ctxpropagation/starter/main.go +++ b/ctxpropagation/starter/main.go @@ -2,10 +2,10 @@ package main import ( "context" - "go.temporal.io/temporal/workflow" "github.com/pborman/uuid" "go.temporal.io/sdk/client" + "go.temporal.io/sdk/workflow" "go.uber.org/zap" "github.com/temporalio/temporal-go-samples/ctxpropagation" diff --git a/ctxpropagation/workflow_test.go b/ctxpropagation/workflow_test.go index c2576d39..4ba2a0c7 100644 --- a/ctxpropagation/workflow_test.go +++ b/ctxpropagation/workflow_test.go @@ -2,13 +2,13 @@ package ctxpropagation import ( "context" - "go.temporal.io/temporal/workflow" "testing" "github.com/stretchr/testify/suite" "go.temporal.io/sdk/activity" "go.temporal.io/sdk/encoded" "go.temporal.io/sdk/testsuite" + "go.temporal.io/sdk/workflow" ) type UnitTestSuite struct { diff --git a/go.mod b/go.mod index 061e1ba6..166b7046 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pborman/uuid v1.2.0 github.com/stretchr/testify v1.6.1 - go.temporal.io/api v0.26.1-0.20200714004414-a2b31a0f7797 - go.temporal.io/sdk v0.26.1-0.20200714051239-9b7db6c0fe19 + go.temporal.io/api v0.27.0 + go.temporal.io/sdk v0.27.0 go.uber.org/zap v1.15.0 golang.org/x/mod v0.3.0 // indirect golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect diff --git a/go.sum b/go.sum index d6a07d9b..3934a22d 100644 --- a/go.sum +++ b/go.sum @@ -93,10 +93,10 @@ github.com/uber/jaeger-client-go v2.23.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMW github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw= github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.temporal.io/api v0.26.1-0.20200714004414-a2b31a0f7797 h1:0PnYP7/kN7CpEeo0RawyL1UN+9png+kFM0heBQGEC4Q= -go.temporal.io/api v0.26.1-0.20200714004414-a2b31a0f7797/go.mod h1:8CY+wo1SfHhGVZslLY5FAAhIA4TWtJJBmRPXObKPjvM= -go.temporal.io/sdk v0.26.1-0.20200714051239-9b7db6c0fe19 h1:Mkw1bq7DpUzGixiJDn7IMlyEwKrA7XefM5e1hLdJIyA= -go.temporal.io/sdk v0.26.1-0.20200714051239-9b7db6c0fe19/go.mod h1:acbrog+vaoQynjBs262eFp0ezLSPnvT36p4izf4xfcQ= +go.temporal.io/api v0.27.0 h1:rKleFvZES4k4j8uCfohLlKL2BBdQgb/syfvrbhkkoz4= +go.temporal.io/api v0.27.0/go.mod h1:8CY+wo1SfHhGVZslLY5FAAhIA4TWtJJBmRPXObKPjvM= +go.temporal.io/sdk v0.27.0 h1:14mSr76PiINPPXaAXsRDoEUOsRFceyQxXFBirNDOXtM= +go.temporal.io/sdk v0.27.0/go.mod h1:drjAzEMmKex7+yE476Wdg/wjhKpOlMPRKfgo+ON/jPQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=