Skip to content

Commit bd45637

Browse files
authored
Merge branch 'master' into snyk-fix-75a55faa28e825af3cd06f7a611a3b88
2 parents 1ae8606 + 533c5a6 commit bd45637

File tree

196 files changed

+51262
-8430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+51262
-8430
lines changed

.github/env/global.env

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
DAPR_CLI_VERSION: 1.13.0
2-
DAPR_RUNTIME_VERSION: 1.13.0
3-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
4-
DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
5-
MACOS_PYTHON_VERSION: 3.10
1+
DAPR_CLI_VERSION: 1.14.1
2+
DAPR_RUNTIME_VERSION: 1.14.4
3+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
4+
DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
5+
MACOS_PYTHON_VERSION: 3.10

.github/holopin.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
organization: dapr
2-
defaultSticker: clmjkxscc122740fl0mkmb7egi
2+
defaultSticker: clrqfb88y222860gjxdlaobhpt
33
stickers:
44
-
5-
id: clmjkxscc122740fl0mkmb7egi
6-
alias: ghc2023
5+
id: clrqfb88y222860gjxdlaobhpt
6+
alias: quickstarts-badge

.github/workflows/validate_go_quickstarts.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ jobs:
102102
for building_block in $building_blocks; do
103103
for variant in "${variants[@]}"
104104
do
105-
if [ ! -d "$building_block/go/$variant" ];
105+
if [ ! -d "$building_block/go/$variant" ];
106106
then
107107
echo "$building_block/go/$variant does not exist."
108108
else
109109
pushd $building_block/go/$variant
110110
echo "Validating $building_block/go/$variant quickstart"
111-
make validate
111+
make validate
112112
popd
113113
fi
114114
done
Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333
runs-on: ${{ matrix.os }}
3434
timeout-minutes: 40
3535
env:
36-
GOVER: 1.17
37-
KUBERNETES_VERSION: v1.21.1
38-
KIND_VERSION: v0.12.0
39-
KIND_IMAGE_SHA: sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
36+
GOVER: 1.22
37+
KUBERNETES_VERSION: v1.29.4
38+
KIND_VERSION: v0.23.0
39+
KIND_IMAGE_SHA: sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8
4040
strategy:
4141
matrix:
4242
os: [ubuntu-latest]
@@ -132,11 +132,10 @@ jobs:
132132
dapr --version
133133
- name: Install Dapr - Kubernetes
134134
run: |
135-
helm repo add bitnami https://charts.bitnami.com/bitnami
136-
helm repo update
137-
helm install redis bitnami/redis --version 17.14.5
138135
dapr init -k --dev --runtime-version=${{ env.DAPR_RUNTIME_VERSION }} --wait || kubectl get pods --all-namespaces
139136
kubectl get nodes -o wide
137+
kubectl describe pod dapr-dev-redis-master-0
138+
helm list
140139
for pod in `dapr status -k | awk '/dapr/ {print $1}'`; do kubectl describe pod -l app=$pod -n dapr-system ; kubectl logs -l app=$pod -n dapr-system; done
141140
- name: Install utilities dependencies
142141
run: |
@@ -148,48 +147,48 @@ jobs:
148147
pushd tutorials/hello-world
149148
make validate
150149
popd
151-
- name: Validate hello-kubernetes multi app run
152-
if: matrix.os == 'ubuntu-latest'
153-
run: |
154-
pushd tutorials/hello-kubernetes
155-
make validate_multi_app_run
156-
popd
150+
# - name: Validate hello-kubernetes multi app run
151+
# if: matrix.os == 'ubuntu-latest'
152+
# run: |
153+
# pushd tutorials/hello-kubernetes
154+
# make validate_multi_app_run
155+
# popd
157156
- name: Validate hello-kubernetes normal run
158157
if: matrix.os == 'ubuntu-latest'
159158
run: |
160159
pushd tutorials/hello-kubernetes
161160
make validate_normal_run
162161
popd
163-
- name: Validate distributed-calculator
164-
if: matrix.os == 'ubuntu-latest'
165-
run: |
166-
pushd tutorials/distributed-calculator
167-
make validate
168-
popd
169-
- name: Validate pub-sub
170-
if: matrix.os == 'ubuntu-latest'
171-
run: |
172-
pushd tutorials/pub-sub
173-
make validate
174-
popd
175-
- name: Validate bindings
176-
if: matrix.os == 'ubuntu-latest'
177-
run: |
178-
pushd tutorials/bindings
179-
make validate
180-
popd
181-
- name: Validate secretstore
182-
if: matrix.os == 'ubuntu-latest'
183-
run: |
184-
pushd tutorials/secretstore
185-
make validate
186-
popd
187-
- name: Validate observability
188-
if: matrix.os == 'ubuntu-latest'
189-
run: |
190-
pushd tutorials/observability
191-
make validate
192-
popd
162+
# - name: Validate distributed-calculator
163+
# if: matrix.os == 'ubuntu-latest'
164+
# run: |
165+
# pushd tutorials/distributed-calculator
166+
# make validate
167+
# popd
168+
# - name: Validate pub-sub
169+
# if: matrix.os == 'ubuntu-latest'
170+
# run: |
171+
# pushd tutorials/pub-sub
172+
# make validate
173+
# popd
174+
# - name: Validate bindings
175+
# if: matrix.os == 'ubuntu-latest'
176+
# run: |
177+
# pushd tutorials/bindings
178+
# make validate
179+
# popd
180+
# - name: Validate secretstore
181+
# if: matrix.os == 'ubuntu-latest'
182+
# run: |
183+
# pushd tutorials/secretstore
184+
# make validate
185+
# popd
186+
# - name: Validate observability
187+
# if: matrix.os == 'ubuntu-latest'
188+
# run: |
189+
# pushd tutorials/observability
190+
# make validate
191+
# popd
193192
- name: Linkcheck README.md
194193
run: |
195194
make validate

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages
2020
**/__pycache__/
2121
**/dist/
2222
Debug/
23+
**_example
2324

2425
# IDE generated files and directories
2526
*.iml
@@ -32,6 +33,7 @@ Debug/
3233
.settings/
3334
.metadata
3435
.project
36+
out/
3537

3638
# Package Files #
3739
*.jar

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# These owners are the maintainers and approvers of this repo
2-
* @maintainers-quickstarts @approvers-quickstarts
2+
* @dapr/maintainers-quickstarts @dapr/approvers-quickstarts

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Pick a building block API (for example, PubSub, state management, etc) and rapid
2222
| [Cryptography](./cryptography) | Perform cryptographic operations without exposing keys to your application |
2323
| [Resiliency](./resiliency) | Define and apply fault-tolerant policies (retries/back-offs, timeouts and circuit breakers) to your Dapr API requests |
2424
| [Workflow](./workflows) | Dapr Workflow enables you to create long running, fault-tolerant, stateful applications |
25+
| [Jobs](./jobs) | Dapr Jobs enable you to manage and schedule tasks |
2526

2627
### Tutorials
2728

actors/csharp/sdk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Let's take a look at the Dapr [Actors building block](https://docs.dapr.io/devel
1313
For this example, you will need:
1414

1515
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
16-
- [.NET 7 SDK](https://dotnet.microsoft.com/download).
16+
- [.NET 8 SDK](https://dotnet.microsoft.com/download).
1717
- Docker Desktop
1818

1919
### Step 2: Set up the environment

actors/csharp/sdk/client/SmartDevice.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
11+
<PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
10+
<PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
1111
</ItemGroup>
1212

1313
</Project>

0 commit comments

Comments
 (0)