Skip to content

Commit 27ce598

Browse files
authored
Bring back stop examples, use 1.2 RCs (#548)
* Revert "Update refs to release-1.2-rc1 (#547)" This reverts commit 30c0089. * Update CLI and daprd to 1.2.0 RCs.
1 parent 30c0089 commit 27ce598

File tree

7 files changed

+65
-10
lines changed

7 files changed

+65
-10
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
GOARCH: amd64
2323
GOPROXY: https://proxy.golang.org
2424
JDK_VER: 13.0.x
25-
DAPR_CLI_VER: 1.1.0-rc.1
26-
DAPR_RUNTIME_VER: 1.1.0-rc.1
27-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
28-
DAPR_CLI_REF: e00080697f348c6123f67e16b22f3c5247d7ac99
29-
DAPR_REF: 57582853ea5db9b6991bdcf07de6f61b165aa960
25+
DAPR_CLI_VER: 1.2.0-rc.1
26+
DAPR_RUNTIME_VER: 1.2.0-rc.3
27+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.2.0-rc.1/install/install.sh
28+
DAPR_CLI_REF:
29+
DAPR_REF:
3030
OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }}
3131
OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }}
3232
GPG_KEY: ${{ secrets.GPG_KEY }}

.github/workflows/validate.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
GOARCH: amd64
2828
GOPROXY: https://proxy.golang.org
2929
JDK_VER: 13.0.x
30-
DAPR_CLI_VER: 1.1.0-rc.1
31-
DAPR_RUNTIME_VER: 1.1.0-rc.1
30+
DAPR_CLI_VER: 1.2.0-rc.1
31+
DAPR_RUNTIME_VER: 1.2.0-rc.3
3232
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh
33-
DAPR_CLI_REF: e00080697f348c6123f67e16b22f3c5247d7ac99
34-
DAPR_REF: 57582853ea5db9b6991bdcf07de6f61b165aa960
33+
DAPR_CLI_REF:
34+
DAPR_REF:
3535
steps:
3636
- uses: actions/checkout@v2
3737
- name: Set up OpenJDK ${{ env.JDK_VER }}

examples/src/main/java/io/dapr/examples/exception/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,17 @@ Once running, the OutputBindingExample should print the output as follows:
111111
...
112112
113113
```
114+
115+
### Cleanup
116+
117+
To stop the app run (or press `CTRL+C`):
118+
119+
<!-- STEP
120+
name: Cleanup
121+
-->
122+
123+
```bash
124+
dapr stop --app-id exception_example
125+
```
126+
127+
<!-- END_STEP -->

examples/src/main/java/io/dapr/examples/pubsub/http/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ name: Cleanup
334334
-->
335335

336336
```bash
337+
dapr stop --app-id publisher
337338
dapr stop --app-id subscriber
338339
```
339340

examples/src/main/java/io/dapr/examples/secrets/README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,19 @@ Once running, the program should print the output as follows:
209209
== APP == {"testVal":"value"}
210210
```
211211

212+
To close the app either press `CTRL+C` or run
213+
214+
<!-- STEP
215+
name: Cleanup first app
216+
-->
217+
218+
```bash
219+
dapr stop --app-id secrets1
220+
```
221+
222+
<!-- END_STEP -->
223+
224+
212225
The example's `config.yaml` is as follows:
213226
```yaml
214227
apiVersion: dapr.io/v1alpha1
@@ -252,6 +265,19 @@ Once running, the program should print the output as follows:
252265
== APP == PERMISSION_DENIED: access denied by policy to get "randomKey" from "vault"
253266
```
254267

268+
To close the app either press `CTRL+C` or run
269+
270+
<!-- STEP
271+
name: Cleanup second app
272+
-->
273+
274+
```bash
275+
dapr stop --app-id secrets2
276+
```
277+
278+
<!-- END_STEP -->
279+
280+
255281
To clean up and bring the vault container down, run
256282

257283
<!-- STEP

examples/src/main/java/io/dapr/examples/state/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,17 @@ Once running, the OutputBindingExample should print the output as follows:
202202
== APP == Done
203203
204204
```
205+
206+
### Cleanup
207+
208+
To close the app either press `CTRL+C` or run
209+
210+
<!-- STEP
211+
name: Cleanup
212+
-->
213+
214+
```bash
215+
dapr stop --app-id state_example
216+
```
217+
218+
<!-- END_STEP -->

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/57582853ea5db9b6991bdcf07de6f61b165aa960/dapr/proto</dapr.proto.baseurl>
19+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.2.0-rc.3/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)