From 2cfb6e308e913d84b9ef28e13665ecb8d8a19eda Mon Sep 17 00:00:00 2001 From: mikeee Date: Wed, 14 Aug 2024 06:36:43 +0100 Subject: [PATCH 1/2] chore: upgrade dapr to v1.14.0 Signed-off-by: mikeee --- Makefile | 2 +- examples/go.mod | 2 +- examples/go.sum | 1 + go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 29365795..2be32666 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ RELEASE_VERSION =v1.0.0-rc-3 GDOC_PORT =8888 -GO_COMPAT_VERSION=1.21 +GO_COMPAT_VERSION=1.22 .PHONY: all all: help diff --git a/examples/go.mod b/examples/go.mod index f9d24ffa..c7d52397 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -18,7 +18,7 @@ require ( github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/dapr/dapr v1.14.0-rc.8 // indirect + github.com/dapr/dapr v1.14.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/go-chi/chi/v5 v5.1.0 // indirect github.com/go-logr/logr v1.4.2 // indirect diff --git a/examples/go.sum b/examples/go.sum index 2008b48f..1d99b092 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -9,6 +9,7 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/dapr/dapr v1.14.0-rc.8 h1:tcPH2O++z1AJsAIuaMu8qE0tx6Ym1i6EFt8x/Wdi9Bo= github.com/dapr/dapr v1.14.0-rc.8/go.mod h1:oDNgaPHQIDZ3G4n4g89TElXWgkluYwcar41DI/oF4gw= +github.com/dapr/dapr v1.14.0/go.mod h1:oDNgaPHQIDZ3G4n4g89TElXWgkluYwcar41DI/oF4gw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/go.mod b/go.mod index 3d161eeb..58ea9f4a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/dapr/go-sdk go 1.22.6 require ( - github.com/dapr/dapr v1.14.0-rc.8 + github.com/dapr/dapr v1.14.0 github.com/go-chi/chi/v5 v5.1.0 github.com/golang/mock v1.6.0 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index 20c2e2cb..a9c983fd 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/dapr/dapr v1.14.0-rc.8 h1:tcPH2O++z1AJsAIuaMu8qE0tx6Ym1i6EFt8x/Wdi9Bo= -github.com/dapr/dapr v1.14.0-rc.8/go.mod h1:oDNgaPHQIDZ3G4n4g89TElXWgkluYwcar41DI/oF4gw= +github.com/dapr/dapr v1.14.0 h1:SIQsNX1kH31JRDIS4k8IZ6eomM/BAcOP844PhQIT+BQ= +github.com/dapr/dapr v1.14.0/go.mod h1:oDNgaPHQIDZ3G4n4g89TElXWgkluYwcar41DI/oF4gw= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= From 2749284a003644f3a778fa81e0276796f06364bd Mon Sep 17 00:00:00 2001 From: mikeee Date: Wed, 14 Aug 2024 06:46:09 +0100 Subject: [PATCH 2/2] ci: remove version override Signed-off-by: mikeee --- .github/workflows/validate_examples.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate_examples.yaml b/.github/workflows/validate_examples.yaml index 718bd234..ddf12530 100644 --- a/.github/workflows/validate_examples.yaml +++ b/.github/workflows/validate_examples.yaml @@ -38,9 +38,9 @@ jobs: CHECKOUT_REF: ${{ github.ref }} outputs: DAPR_INSTALL_URL: ${{ env.DAPR_INSTALL_URL }} - DAPR_CLI_VER: 1.14.0-rc.8 + DAPR_CLI_VER: ${{ steps.outputs.outputs.DAPR_CLI_VER }} DAPR_CLI_REF: ${{ steps.outputs.outputs.DAPR_CLI_REF }} - DAPR_RUNTIME_VER: 1.14.0-rc.8 + DAPR_RUNTIME_VER: ${{ steps.outputs.outputs.DAPR_RUNTIME_VER }} CHECKOUT_REPO: ${{ steps.outputs.outputs.CHECKOUT_REPO }} CHECKOUT_REF: ${{ steps.outputs.outputs.CHECKOUT_REF }} DAPR_REF: ${{ steps.outputs.outputs.DAPR_REF }}