digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 09:17:43 +03:00
Code Issues Projects Releases Wiki Activity

Update compatibility for the HOCON-related changes (#14543)

Browse Source 
CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
Sergey Kisel 2022-07-27 13:01:47 +02:00 committed by GitHub
parent 75e781c04a
commit 71e627fb15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility/bazel_tools/create-daml-app/index.test.ts
View File

@ -146,7 +146,7 @@ beforeAll(async () => {
`--participant=participant-id=sandbox,port=0,port-file=${SANDBOX_PORT_FILE_NAME}`
];
const sandboxOnXCommand = semver.gt(process.env.SANDBOX_VERSION, "2.3.0-snapshot.20220619.10104.0.253b0b18" ) || process.env.SANDBOX_VERSION === "0.0.0"
const sandboxOnXCommand = semver.gt(process.env.SANDBOX_VERSION, "2.4.0-snapshot.20220712.10212.0.0bf28176" ) || process.env.SANDBOX_VERSION === "0.0.0"
? ["run-legacy-cli-config"]
: [];

2
compatibility/bazel_tools/daml_script/daml_script.bzl
View File

@ -65,7 +65,7 @@ def daml_script_test(compiler_version, runner_version):
# 1.16.0 is the first SDK version that defaulted to LF 1.14, which is the earliest LF version that Canton supports
use_canton = versions.is_at_least("2.0.0", runner_version) and versions.is_at_least("1.16.0", compiler_version)
use_sandbox_on_x = versions.is_at_least("2.0.0", runner_version) and not use_canton
sandbox_on_x_command = ["run-legacy-cli-config"] if versions.is_at_least("2.3.0-snapshot.20220619.10104.0.253b0b18", runner_version) else []
sandbox_on_x_command = ["run-legacy-cli-config"] if versions.is_at_least("2.4.0-snapshot.20220712.10212.0.0bf28176", runner_version) else []
if use_sandbox_on_x:
server = "@daml-sdk-{version}//:sandbox-on-x".format(version = runner_version)

2
compatibility/bazel_tools/daml_trigger/daml_trigger.bzl
View File

@ -128,7 +128,7 @@ def daml_trigger_test(compiler_version, runner_version):
# 1.16.0 is the first SDK version that uses LF 1.14, which is the earliest version that canton supports
use_canton = versions.is_at_least("2.0.0", runner_version) and versions.is_at_least("1.16.0", compiler_version)
use_sandbox_on_x = versions.is_at_least("2.0.0", runner_version) and not use_canton
sandbox_on_x_command = ["run-legacy-cli-config"] if versions.is_at_least("2.3.0-snapshot.20220619.10104.0.253b0b18", runner_version) else []
sandbox_on_x_command = ["run-legacy-cli-config"] if versions.is_at_least("2.4.0-snapshot.20220712.10212.0.0bf28176", runner_version) else []
if use_sandbox_on_x:
server = "@daml-sdk-{version}//:sandbox-on-x".format(version = runner_version)
server_args = sandbox_on_x_command + ["--participant", "participant-id=sandbox,port=6865"]

2
compatibility/bazel_tools/testing.bzl
View File

@ -1108,7 +1108,7 @@ def sdk_platform_test(sdk_version, platform_version):
sandbox_on_x = "@daml-sdk-{}//:sandbox-on-x".format(platform_version)
sandbox_on_x_args = ["--contract-id-seeding=testing-weak", "--implicit-party-allocation=false", "--mutable-contract-state-cache"]
sandbox_on_x_cmd = ["run-legacy-cli-config"] if versions.is_at_least("2.3.0-snapshot.20220619.10104.0.253b0b18", platform_version) else []
sandbox_on_x_cmd = ["run-legacy-cli-config"] if versions.is_at_least("2.4.0-snapshot.20220712.10212.0.0bf28176", platform_version) else []
json_api_args = ["json-api"]

2
compatibility/sandbox-migration/runner/Migration/Runner.hs
View File

@ -104,7 +104,7 @@ supportsSandboxOnX :: SemVer.Version -> Bool
supportsSandboxOnX v = v == SemVer.initial || v >= (SemVer.initial & SemVer.major .~ 2)
supportsSandboxOnXHocon :: SemVer.Version -> Bool
supportsSandboxOnXHocon ver = ver == SemVer.initial || ver > (fromRight' $ SemVer.fromText "2.3.0-snapshot.20220619.10104.0.253b0b18")
supportsSandboxOnXHocon ver = ver == SemVer.initial || ver > (fromRight' $ SemVer.fromText "2.4.0-snapshot.20220712.10212.0.0bf28176")
supportsAppendOnly :: SemVer.Version -> Bool
supportsAppendOnly v = v == SemVer.initial