Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update canton to 20241010.12284.0.vb1ef62ff/2.10.0-snapshot.20241010.12284.0.vb1ef62ff in main-2.x #20085

Merged
merged 2 commits into from
Oct 11, 2024
Merged

update canton to 20241010.12284.0.vb1ef62ff/2.10.0-snapshot.20241010.12284.0.vb1ef62ff in main-2.x #20085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ff3748
update canton to 20241010.12284.0.vb1ef62ff/2.10.0-snapshot.20241010.…
Oct 11, 2024
0dc30f8
reapply canton change from (#20069)
remyhaemmerle-da Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/canton/community/app/src/pack/examples/06-messaging/contact/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
sandbox-options:
- --wall-clock-time
name: contact
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/app/src/pack/examples/06-messaging/message/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
sandbox-options:
- --wall-clock-time
name: message
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
build-options:
- --target=1.14
name: CantonExamples
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
name: ai-analysis
source: AIAnalysis.daml
init-script: AIAnalysis:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/bank/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
name: bank
source: Bank.daml
init-script: Bank:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/doctor/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
name: doctor
source: Doctor.daml
init-script: Doctor:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
name: health-insurance
source: HealthInsurance.daml
init-script: HealthInsurance:setup
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
name: medical-records
source: MedicalRecord.daml
init-script: MedicalRecord:setup
Expand Down
4 changes: 4 additions & 0 deletions sdk/canton/community/ledger-api/docs/rst_mmd.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ Message has no fields.
{{else -}}
{{range $message.Fields}}{{$field := . -}}

{{if $field.IsOneof -}}
.. _{{$message.FullName}}.{{$field.OneofDecl}}.{{$field.Name}}:
{{- else -}}
.. _{{$message.FullName}}.{{$field.Name}}:
{{- end}}

``{{if $field.IsOneof -}}oneof {{$field.OneofDecl}}.{{end -}}
{{$field.Name}}`` : :ref:`{{$field.LongType}} <{{$field.FullType}}>`
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/ledger/ledger-json-api/src/test/daml/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
build-options:
- --target=1.14
name: JsonEncodingTest
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/participant/src/main/daml/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
name: AdminWorkflows
source: AdminWorkflows.daml
version: 2.10.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/canton/community/participant/src/main/daml/ping-pong-vacuum/daml.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sdk-version: 2.10.0-snapshot.20241008.12998.0.v085a1a73
sdk-version: 2.10.0-snapshot.20241009.13001.0.v44d905ca
build-options:
- --target=1.14
name: AdminWorkflowsWithVacuuming
Expand Down
6 changes: 3 additions & 3 deletions sdk/test-common/canton/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ if [ "{local}" = "true" ]; then
exit 0
fi

CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241009.12280.0.vea0cd639
CANTON_ENTERPRISE_SHA=941b44e366c084c25d544561faa854c9ed3f103afa62121daadc9b7da0eab314
CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241009.12280.0.vea0cd639/941b44e366c084c25d544561faa854c9ed3f103afa62121daadc9b7da0eab314/canton-enterprise-2.10.0-snapshot.20241009.12280.0.vea0cd639.tar.gz
CANTON_ENTERPRISE_VERSION=2.10.0-snapshot.20241010.12284.0.vb1ef62ff
CANTON_ENTERPRISE_SHA=72129398016fe988d2738b7b16e8f587a31b1eda1531f9c0ca79d918c692b0fb
CANTON_ENTERPRISE_URL=https://digitalasset.jfrog.io/artifactory/assembly/daml/canton-backup/2.10.0-snapshot.20241010.12284.0.vb1ef62ff/72129398016fe988d2738b7b16e8f587a31b1eda1531f9c0ca79d918c692b0fb/canton-enterprise-2.10.0-snapshot.20241010.12284.0.vb1ef62ff.tar.gz

url=$$CANTON_ENTERPRISE_URL

Expand Down
Loading