Skip to content

Commit

Permalink
Merge branch 'release-1.14' into fix-jobs-questionmark
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeee committed Jul 26, 2024
2 parents e6d8521 + c376acc commit d6ed760
Show file tree
Hide file tree
Showing 43 changed files with 22,645 additions and 3,010 deletions.
77 changes: 38 additions & 39 deletions .github/workflows/validate_tutorials.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,10 @@ jobs:
dapr --version
- name: Install Dapr - Kubernetes
run: |
helm repo add bitnami https://charts.bitnami.com/bitnami
helm repo update
helm install redis bitnami/redis --version 17.14.5
dapr init -k --dev --runtime-version=${{ env.DAPR_RUNTIME_VERSION }} --wait || kubectl get pods --all-namespaces
kubectl get nodes -o wide
kubectl describe pod dapr-dev-redis-master-0
helm list
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
- name: Install utilities dependencies
run: |
Expand All @@ -148,48 +147,48 @@ jobs:
pushd tutorials/hello-world
make validate
popd
- name: Validate hello-kubernetes multi app run
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/hello-kubernetes
make validate_multi_app_run
popd
# - name: Validate hello-kubernetes multi app run
# if: matrix.os == 'ubuntu-latest'
# run: |
# pushd tutorials/hello-kubernetes
# make validate_multi_app_run
# popd
- name: Validate hello-kubernetes normal run
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/hello-kubernetes
make validate_normal_run
popd
- name: Validate distributed-calculator
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/distributed-calculator
make validate
popd
- name: Validate pub-sub
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/pub-sub
make validate
popd
- name: Validate bindings
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/bindings
make validate
popd
- name: Validate secretstore
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/secretstore
make validate
popd
- name: Validate observability
if: matrix.os == 'ubuntu-latest'
run: |
pushd tutorials/observability
make validate
popd
# - name: Validate distributed-calculator
# if: matrix.os == 'ubuntu-latest'
# run: |
# pushd tutorials/distributed-calculator
# make validate
# popd
# - name: Validate pub-sub
# if: matrix.os == 'ubuntu-latest'
# run: |
# pushd tutorials/pub-sub
# make validate
# popd
# - name: Validate bindings
# if: matrix.os == 'ubuntu-latest'
# run: |
# pushd tutorials/bindings
# make validate
# popd
# - name: Validate secretstore
# if: matrix.os == 'ubuntu-latest'
# run: |
# pushd tutorials/secretstore
# make validate
# popd
# - name: Validate observability
# if: matrix.os == 'ubuntu-latest'
# run: |
# pushd tutorials/observability
# make validate
# popd
- name: Linkcheck README.md
run: |
make validate
2 changes: 1 addition & 1 deletion actors/csharp/sdk/client/SmartDevice.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
<PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion actors/csharp/sdk/interfaces/SmartDevice.Interfaces.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
<PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions actors/csharp/sdk/service/SmartDevice.Service.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.Actors" Version="1.13.*-*" />
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.13.*-*" />
<PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.14.*-*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion bindings/csharp/sdk/batch/batch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.13.*-*" />
<PackageReference Include="Dapr.AspNetCore" Version="1.14.*-*" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions bindings/javascript/sdk/batch/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/javascript/sdk/batch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@dapr/dapr": "^3.3.0",
"@dapr/dapr": "^3.3.1",
"axios": "^0.25.0"
}
}
2 changes: 1 addition & 1 deletion bindings/python/sdk/batch/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dapr>=1.13.0a,<1.14.0
dapr>=1.14.0a,<1.15.0
Flask
typing-extensions
2 changes: 1 addition & 1 deletion configuration/csharp/sdk/order-processor/Program.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.13.*-*" />
<PackageReference Include="Dapr.AspNetCore" Version="1.14.*-*" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions configuration/javascript/sdk/order-processor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion configuration/javascript/sdk/order-processor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"eslint-plugin-react": "^7.28.0"
},
"dependencies": {
"@dapr/dapr": "^3.3.0"
"@dapr/dapr": "^3.3.1"
}
}
2 changes: 1 addition & 1 deletion configuration/python/sdk/order-processor/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dapr>=1.13.0a,<1.14.0
dapr>=1.14.0a,<1.15.0
typing-extensions
14 changes: 7 additions & 7 deletions cryptography/javascript/sdk/crypto-quickstart/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cryptography/javascript/sdk/crypto-quickstart/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "",
"license": "MIT",
"dependencies": {
"@dapr/dapr": "^3.3.0"
"@dapr/dapr": "^3.3.1"
},
"devDependencies": {
"@types/node": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion pub_sub/csharp/sdk/checkout/checkout.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapr.AspNetCore" Version="1.13.*-*" />
<PackageReference Include="Dapr.AspNetCore" Version="1.14.*-*" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion pub_sub/csharp/sdk/order-processor/order-processor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="Dapr.AspNetCore" Version="1.13.*-*" />
<PackageReference Include="Dapr.AspNetCore" Version="1.14.*-*" />
</ItemGroup>

</Project>
14 changes: 7 additions & 7 deletions pub_sub/javascript/sdk/checkout/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pub_sub/javascript/sdk/checkout/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"author": "",
"license": "ISC",
"dependencies": {
"@dapr/dapr": "^3.3.0"
"@dapr/dapr": "^3.3.1"
}
}
14 changes: 7 additions & 7 deletions pub_sub/javascript/sdk/order-processor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pub_sub/javascript/sdk/order-processor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"author": "",
"license": "ISC",
"dependencies": {
"@dapr/dapr": "^3.3.0"
"@dapr/dapr": "^3.3.1"
}
}
2 changes: 1 addition & 1 deletion pub_sub/python/sdk/checkout/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dapr>=1.13.0a,<1.14.0
dapr>=1.14.0a,<1.15.0
2 changes: 1 addition & 1 deletion pub_sub/python/sdk/order-processor/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Flask
dapr>=1.13.0a,<1.14.0
dapr>=1.14.0a,<1.15.0
cloudevents
uvicorn
typing-extensions
Loading

0 comments on commit d6ed760

Please sign in to comment.