chore: use rc2

Signed-off-by: mikeee <[email protected]>
mikeee · Jul 8, 2024 · 9008fd7 · 9008fd7
1 parent 2506565
commit 9008fd7
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/validate_examples.yaml b/.github/workflows/validate_examples.yaml
@@ -32,8 +32,8 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
-      DAPR_CLI_REF: 57c6048ac9098be1ccf9d5dd96e5c43431165691
-      DAPR_REF: a4bc8d46417da18131f1fd2fe36a137e08b78194
+      DAPR_CLI_REF: ${{ github.event.inputs.daprcli_commit }}
+      DAPR_REF: ${{ github.event.inputs.daprdapr_commit }}
       CHECKOUT_REPO: ${{ github.repository }}
       CHECKOUT_REF: ${{ github.ref }}
     outputs:
@@ -147,8 +147,8 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       DAPR_INSTALL_URL: ${{ needs.setup.outputs.DAPR_INSTALL_URL }}
-      DAPR_CLI_VER: ${{ needs.setup.outputs.DAPR_CLI_VER }}
-      DAPR_RUNTIME_VER: ${{ needs.setup.outputs.DAPR_RUNTIME_VER }}
+      DAPR_CLI_VER: "1.14.0-rc.2"
+      DAPR_RUNTIME_VER: "1.14.0-rc.2"
       DAPR_CLI_REF: ${{ needs.setup.outputs.DAPR_CLI_REF }}
       DAPR_REF: ${{ needs.setup.outputs.DAPR_REF }}
       CHECKOUT_REPO: ${{ needs.setup.outputs.CHECKOUT_REPO }}
@@ -215,14 +215,11 @@ jobs:
         run: |
           sudo cp $HOME/artifacts/$GITHUB_SHA/dapr /usr/local/bin/dapr
 
-      - name: Override daprd and scheduler with referenced commit.
+      - name: Override daprd with referenced commit.
         if: env.DAPR_REF != ''
         run: |
           mkdir -p $HOME/.dapr/bin/
           cp $HOME/artifacts/$GITHUB_SHA/daprd $HOME/.dapr/bin/daprd
-          chmod +x $HOME/artifacts/$GITHUB_SHA/scheduler
-          cp $HOME/artifacts/$GITHUB_SHA/scheduler $HOME/.dapr/bin/scheduler
-          $HOME/.dapr/bin/scheduler &
 
       - name: Set up Python ${{ env.PYTHON_VER }}
         uses: actions/setup-python@v5

diff --git a/client/scheduling.go b/client/scheduling.go
@@ -53,7 +53,7 @@ func (c *GRPCClient) GetJobAlpha1(ctx context.Context, name string) (*Job, error
 	})
 	log.Println(resp)
 	if err != nil {
-		return &Job{}, err
+		return nil, err
 	}
 	return &Job{
 		Name:     resp.GetJob().GetName(),

diff --git 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.2.0 // indirect
-	github.com/dapr/dapr v1.13.0-rc.1.0.20240701104319-ee2f88f557f9 // indirect
+	github.com/dapr/dapr v1.14.0-rc.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/go-chi/chi/v5 v5.0.12 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

diff --git a/examples/go.sum b/examples/go.sum
@@ -7,8 +7,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/dapr/dapr v1.13.0-rc.1.0.20240701104319-ee2f88f557f9 h1:VpLNsKq1ONpRt/efihI+wlQTaMl3jWad+5NgsUpPBFE=
-github.com/dapr/dapr v1.13.0-rc.1.0.20240701104319-ee2f88f557f9/go.mod h1:3qFLJY6HJ1FdqlgYPln509uTTyGJiFRIh03zhZkJ0sY=
+github.com/dapr/dapr v1.14.0-rc.2 h1:wuXninZLTyokeztCinVIVAc9mpVYJS8QyxecPCLdlY8=
+github.com/dapr/dapr v1.14.0-rc.2/go.mod h1:uZMuD9K7y+LKSsQUoSAvv1Yn8Cim9X/9ZQ9XuTobyP8=
 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
@@ -1,9 +1,9 @@
 module github.com/dapr/go-sdk
 
-go 1.22.3
+go 1.22.4
 
 require (
-	github.com/dapr/dapr v1.13.0-rc.1.0.20240701104319-ee2f88f557f9
+	github.com/dapr/dapr v1.14.0-rc.2
 	github.com/go-chi/chi/v5 v5.0.12
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.6.0

diff --git a/go.sum b/go.sum
@@ -3,6 +3,8 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/dapr/dapr v1.13.0-rc.1.0.20240701104319-ee2f88f557f9 h1:VpLNsKq1ONpRt/efihI+wlQTaMl3jWad+5NgsUpPBFE=
 github.com/dapr/dapr v1.13.0-rc.1.0.20240701104319-ee2f88f557f9/go.mod h1:3qFLJY6HJ1FdqlgYPln509uTTyGJiFRIh03zhZkJ0sY=
+github.com/dapr/dapr v1.14.0-rc.2 h1:wuXninZLTyokeztCinVIVAc9mpVYJS8QyxecPCLdlY8=
+github.com/dapr/dapr v1.14.0-rc.2/go.mod h1:uZMuD9K7y+LKSsQUoSAvv1Yn8Cim9X/9ZQ9XuTobyP8=
 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.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=