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

Fix project versions of DAML Script and DAML Triggers (#6622)

Browse Source 
GHC has weird restriction on version numbers which damlc inserits so
we need to use `ghc_version` instead of `sdk_version`. That only makes
a difference for snapshot versions where the `-snapshot.` part is
replaced by `.`.

changelog_begin
changelog_end
This commit is contained in:
Moritz Kiefer 2020-07-06 17:07:39 +02:00 committed by GitHub
parent 1b533561b4
commit 907e4fe678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daml-script/daml/BUILD.bazel
View File

@ -3,7 +3,7 @@
# TODO Once daml_compile uses build instead of package we should use
# daml_compile instead of a genrule.
load("@build_environment//:configuration.bzl", "sdk_version")
load("@build_environment//:configuration.bzl", "ghc_version", "sdk_version")
DAML_LF_VERSIONS = [
"1.7",
@ -27,7 +27,7 @@ DAML_LF_VERSIONS = [
sdk-version: {sdk}
name: daml-script
source: daml
version: {sdk}
version: {ghc}
dependencies:
- daml-stdlib
- daml-prim
@ -44,6 +44,7 @@ EOF
lf_version,
] if lf_version else []),
sdk = sdk_version,
ghc = ghc_version,
),
tools = ["//compiler/damlc"],
visibility = ["//visibility:public"],

5
triggers/daml/BUILD.bazel
View File

@ -4,7 +4,7 @@
# TODO Once daml_compile uses build instead of package we should use
# daml_compile instead of a genrule.
load("@build_environment//:configuration.bzl", "sdk_version")
load("@build_environment//:configuration.bzl", "ghc_version", "sdk_version")
DAML_LF_VERSIONS = [
"1.7",
@ -31,7 +31,7 @@ DAML_LF_VERSIONS = [
sdk-version: {sdk}
name: daml-trigger
source: daml
version: {sdk}
version: {ghc}
dependencies:
- daml-stdlib
- daml-prim
@ -48,6 +48,7 @@ EOF
lf_version,
] if lf_version else []),
sdk = sdk_version,
ghc = ghc_version,
),
tools = ["//compiler/damlc"],
visibility = ["//visibility:public"],