Skip to content

Commit 7359393

Browse files
authored
Merge branch 'master' into actors-reminders-always-set
2 parents 8605f03 + e7a8637 commit 7359393

File tree

5 files changed

+119
-46
lines changed

5 files changed

+119
-46
lines changed

.github/scripts/generate_release_notes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ def get_repo_priority(name):
165165
a = [l.login for l in issueOrPR.assignees]
166166
if len(a) == 0:
167167
print("Issue is unassigned: {}".format(url))
168-
for c in a:
168+
for c in a:
169169
contributors.add("@" + str(c))
170170
repo = issueOrPR.repository
171171
if repo == "docs":
172172
# Do not add this to the list of changes (but add to contributors).
173173
continue
174174
hasNote = False
175-
if not (issueOrPR.body is None):
175+
if issueOrPR.body is not None:
176176
match = re.search(releaseNoteRegex, issueOrPR.body, re.M)
177177
if match:
178178
note = match.group(1).strip()
@@ -212,7 +212,7 @@ def get_repo_priority(name):
212212
# set issue url
213213
changeUrl = " [" + str(change[1].number) + "](" + change[4] + ")"
214214
changeLines.append("- " + change[2] + changeUrl)
215-
215+
216216
if breakingChange:
217217
if lastBreakingChangeSubtitle != subtitle:
218218
lastBreakingChangeSubtitle = subtitle

.github/scripts/validate_sidecar_resources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def run_sidecar(executable, app_id):
8080

8181
def test_diff(arr_old, arr_new, label, test='ttest'):
8282
# Output mean and median for memory utilization
83-
83+
8484
p25_new, p50_new, p75_new = np.percentile(arr_new, [25, 50, 75])
8585
p25_old, p50_old, p75_old = np.percentile(arr_old, [25, 50, 75])
8686

@@ -127,7 +127,7 @@ def size_diff(old_binary, new_binary):
127127

128128
print(f"Passed! Did not find significant increase in file size: was {old_size} KB, now {new_size} KB.")
129129
return False
130-
130+
131131

132132
def getenv(key, default):
133133
v = os.getenv(key)

dapr/README.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,42 @@ make init-proto
2626
make gen-proto
2727
```
2828

29+
### Instructions on Windows (WSL2 with Ubuntu 24.04)
30+
Use the following variation of the steps above
31+
32+
1. Install protoc version: [v25.4](https://github.com/protocolbuffers/protobuf/releases/tag/v25.4) with the following
33+
from your Ubuntu terminal to download the protoc package locally, unzip and copy into /usr/bin/protoc, update your
34+
$PATH and delete the local temp directory.
35+
```bash
36+
sudo apt install unzip
37+
cd ~
38+
mkdir protoc
39+
cd protoc
40+
# Assumes 32- or 64-bit - replace as necessary
41+
wget https://github.com/protocolbuffers/protobuf/releases/download/v25.4/protoc-25.4-linux-x86_64.zip
42+
unzip protoc-25.4-linux-x64_64.zip
43+
rm protoc-25.4-linux-x64_64.zip
44+
sudo mv bin/* /usr/local/bin
45+
sudo mv include/* /usr/local/include
46+
cd ..
47+
sudo rm -r protoc
48+
```
49+
2. Navigate to your Dapr repository. For example, if you've got it in Windows at `P:/Code/Dapr` in your Ubuntu terminal
50+
use `cd /mnt/p/Code/Dapr`.
51+
3. Install proto-gen-go and protoc-gen-go-grpc, then move from their install directory to your previously created directory
52+
in `/usr/bin/protoc`
53+
```bash
54+
make init-proto
55+
cp ~/go/bin
56+
ln -s ~/go/bin/protoc-gen-go /usr/local/bin
57+
ln -s ~/go/bin/proto-gen-go-grpc /usr/local/bin
58+
```
59+
4. Generate the proto clients
60+
```bash
61+
make gen-proto
62+
```
63+
64+
2965
## Update e2e test apps
3066

3167
Whenever there are breaking changes in the proto files, we need to update the e2e test apps to use the correct version of dapr dependencies. This can be done by navigating to the tests folder and running the commands:-

go.mod

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/argoproj/argo-rollouts v1.4.1
1212
github.com/cenkalti/backoff/v4 v4.3.0
1313
github.com/cloudevents/sdk-go/v2 v2.15.2
14-
github.com/dapr/components-contrib v1.15.1-0.20250312205032-d8ac01bc76b8
14+
github.com/dapr/components-contrib v1.15.2
1515
github.com/dapr/durabletask-go v0.6.5
1616
github.com/dapr/kit v0.15.1
1717
github.com/diagridio/go-etcd-cron v0.4.4
@@ -43,7 +43,7 @@ require (
4343
github.com/prometheus/client_golang v1.20.4
4444
github.com/prometheus/client_model v0.6.1
4545
github.com/prometheus/common v0.59.1
46-
github.com/redis/go-redis/v9 v9.2.1
46+
github.com/redis/go-redis/v9 v9.6.3
4747
github.com/sony/gobreaker v0.5.0
4848
github.com/spf13/cast v1.6.0
4949
github.com/spf13/pflag v1.0.5
@@ -144,19 +144,19 @@ require (
144144
github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible // indirect
145145
github.com/aliyun/aliyun-tablestore-go-sdk v1.7.10 // indirect
146146
github.com/aliyun/credentials-go v1.1.2 // indirect
147-
github.com/andybalholm/brotli v1.0.6 // indirect
147+
github.com/andybalholm/brotli v1.1.0 // indirect
148148
github.com/anshal21/go-worker v1.1.0 // indirect
149149
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
150150
github.com/apache/dubbo-getty v1.4.9-0.20220610060150-8af010f3f3dc // indirect
151151
github.com/apache/dubbo-go-hessian2 v1.11.5 // indirect
152-
github.com/apache/pulsar-client-go v0.11.0 // indirect
152+
github.com/apache/pulsar-client-go v0.14.0 // indirect
153153
github.com/apache/rocketmq-client-go/v2 v2.1.2-0.20230412142645-25003f6f083d // indirect
154154
github.com/apache/thrift v0.13.0 // indirect
155155
github.com/ardielle/ardielle-go v1.5.2 // indirect
156156
github.com/armon/go-metrics v0.4.1 // indirect
157157
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
158158
github.com/aws/aws-msk-iam-sasl-signer-go v1.0.1-0.20241125194140-078c08b8574a // indirect
159-
github.com/aws/aws-sdk-go v1.50.19 // indirect
159+
github.com/aws/aws-sdk-go v1.55.6 // indirect
160160
github.com/aws/aws-sdk-go-v2 v1.32.4 // indirect
161161
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect
162162
github.com/aws/aws-sdk-go-v2/config v1.28.2 // indirect
@@ -218,7 +218,7 @@ require (
218218
github.com/eapache/queue v1.1.0 // indirect
219219
github.com/eclipse/paho.mqtt.golang v1.4.3 // indirect
220220
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
221-
github.com/emirpasic/gods v1.12.0 // indirect
221+
github.com/emirpasic/gods v1.18.1 // indirect
222222
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
223223
github.com/fasthttp-contrib/sessions v0.0.0-20160905201309-74f6ac73d5d5 // indirect
224224
github.com/fatih/color v1.17.0 // indirect
@@ -252,9 +252,8 @@ require (
252252
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
253253
github.com/gofrs/uuid v4.4.0+incompatible // indirect
254254
github.com/gogo/protobuf v1.3.2 // indirect
255-
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
256255
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
257-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
256+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
258257
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
259258
github.com/golang-sql/sqlexp v0.1.0 // indirect
260259
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -274,7 +273,7 @@ require (
274273
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
275274
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
276275
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
277-
github.com/hamba/avro/v2 v2.20.1 // indirect
276+
github.com/hamba/avro/v2 v2.25.1 // indirect
278277
github.com/hashicorp/consul/api v1.25.1 // indirect
279278
github.com/hashicorp/errwrap v1.1.0 // indirect
280279
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -349,7 +348,7 @@ require (
349348
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
350349
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
351350
github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
352-
github.com/nats-io/nats.go v1.28.0 // indirect
351+
github.com/nats-io/nats.go v1.31.0 // indirect
353352
github.com/nats-io/nkeys v0.4.6 // indirect
354353
github.com/nats-io/nuid v1.0.1 // indirect
355354
github.com/ncruces/go-strftime v0.1.9 // indirect
@@ -383,7 +382,7 @@ require (
383382
github.com/sendgrid/sendgrid-go v3.13.0+incompatible // indirect
384383
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
385384
github.com/shoenig/go-m1cpu v0.1.6 // indirect
386-
github.com/sijms/go-ora/v2 v2.7.18 // indirect
385+
github.com/sijms/go-ora/v2 v2.8.22 // indirect
387386
github.com/sirupsen/logrus v1.9.3 // indirect
388387
github.com/soheilhy/cmux v0.1.5 // indirect
389388
github.com/sourcegraph/conc v0.3.0 // indirect
@@ -407,7 +406,7 @@ require (
407406
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
408407
github.com/tmc/langchaingo v0.1.12 // indirect
409408
github.com/valyala/bytebufferpool v1.0.0 // indirect
410-
github.com/valyala/fasthttp v1.51.0 // indirect
409+
github.com/valyala/fasthttp v1.53.0 // indirect
411410
github.com/vmware/vmware-go-kcl v1.5.1 // indirect
412411
github.com/x448/float16 v0.8.4 // indirect
413412
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -439,7 +438,7 @@ require (
439438
golang.org/x/arch v0.10.0 // indirect
440439
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
441440
golang.org/x/mod v0.22.0 // indirect
442-
golang.org/x/oauth2 v0.24.0 // indirect
441+
golang.org/x/oauth2 v0.27.0 // indirect
443442
golang.org/x/sys v0.30.0 // indirect
444443
golang.org/x/term v0.29.0 // indirect
445444
golang.org/x/text v0.22.0 // indirect

0 commit comments

Comments
 (0)