Skip to content

Commit f33d99d

Browse files
halspanghalspang
authored
Merge branch 'master' into flaky_it
2 parents f26f8d2 + 621d4f8 commit f33d99d

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
GOARCH: amd64
2323
GOPROXY: https://proxy.golang.org
2424
JDK_VER: 13.0.x
25-
DAPR_CLI_VER: 1.0.0-rc.6
26-
DAPR_RUNTIME_VER: 1.0.0-rc.4
25+
DAPR_CLI_VER: 1.1.0-rc.1
26+
DAPR_RUNTIME_VER: 1.1.0-rc.1
2727
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
2828
DAPR_CLI_REF:
2929
DAPR_REF:

‎.github/workflows/validate.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
GOARCH: amd64
2828
GOPROXY: https://proxy.golang.org
2929
JDK_VER: 13.0.x
30-
DAPR_CLI_VER: 1.0.0-rc.6
31-
DAPR_RUNTIME_VER: 1.0.0-rc.4
30+
DAPR_CLI_VER: 1.1.0-rc.1
31+
DAPR_RUNTIME_VER: 1.1.0-rc.1
3232
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
3333
DAPR_CLI_REF:
3434
DAPR_REF:

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<grpc.version>1.33.1</grpc.version>
1818
<protobuf.version>3.13.0</protobuf.version>
19-
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/4899aa8fb8f7537fb10432e6cc0cfc09c572cb54/dapr/proto</dapr.proto.baseurl>
19+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto</dapr.proto.baseurl>
2020
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
2121
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
2222
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>

0 commit comments

Comments
 (0)