digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-11-12 13:05:08 +03:00
Code Issues Projects Releases Wiki Activity

Bump ghcide (#9041)

Browse Source 
* Bump ghcide

Includes https://github.com/digital-asset/daml-ghcide/pull/13 meaning
we can now remove the hacks for missing signatures

changelog_begin

- [Daml Compiler] Fix a bug where passing `--ghc-option=-Werror` also
  produced errors for warnings produced by `-Wmissing-signatures` even
  if the user did not explicitly enable this.

changelog_end

* Bump to merged commit

changelog_begin
changelog_end
This commit is contained in:
Moritz Kiefer 2021-03-05 18:17:28 +01:00 committed by GitHub
parent 41d62ea5c0
commit 5d88c08832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bazel-haskell-deps.bzl
View File

@ -17,8 +17,8 @@ load("@os_info//:os_info.bzl", "is_windows")
load("@dadew//:dadew.bzl", "dadew_tool_home")
load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")
GHCIDE_REV = "a6879b77da2968bae9256bb2f5658b909056d4ef"
GHCIDE_SHA256 = "94be2607354c7ab111b87fa2b4afe8f6ef50981277864a05e906b7b0a783c58f"
GHCIDE_REV = "c8818a7d7abf66a4a7302b360857e3a790ab1be4"
GHCIDE_SHA256 = "999cd7677b0e6747b6ab7a1e503afc23380cd0c12d9781b09f9a905b8f49cca7"
GHCIDE_VERSION = "0.1.0"
JS_JQUERY_VERSION = "3.3.1"
JS_DGTABLE_VERSION = "0.5.2"

6
daml-script/test/BUILD.bazel
View File

@ -35,7 +35,7 @@ dependencies:
- daml-prim
- daml-script.dar
EOF
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location script-test.dar)
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script-test.dar)
rm -rf $$TMP_DIR
""".format(sdk = sdk_version),
tools = ["//compiler/damlc"],
@ -66,7 +66,7 @@ dependencies:
- daml-prim
- daml-script-1.dev.dar
EOF
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location script-test-1.dev.dar)
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script-test-1.dev.dar)
rm -rf $$TMP_DIR
""".format(sdk = sdk_version),
tools = ["//compiler/damlc"],
@ -99,7 +99,7 @@ dependencies:
- daml-prim
- daml-script.dar
EOF
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location script-test-no-ledger.dar)
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script-test-no-ledger.dar)
rm -rf $$TMP_DIR
""".format(sdk = sdk_version),
tools = ["//compiler/damlc"],

4
rules_daml/daml.bzl
View File

@ -19,9 +19,7 @@ _zipper = attr.label(
cfg = "host",
)
# For some reason, -Werror seems to turn on -Wmissing-signatures so we turn
# it off again.
ghc_opts = ["--ghc-option=-Werror", "--ghc-option=-Wno-error=missing-signatures"]
ghc_opts = ["--ghc-option=-Werror"]
def _daml_configure_impl(ctx):
project_name = ctx.attr.project_name

2
triggers/service/BUILD.bazel
View File

@ -211,7 +211,7 @@ dependencies:
- daml-trigger.dar
- daml-script.dar
EOF
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location test-model.dar)
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location test-model.dar)
rm -rf $$TMP_DIR
""".format(sdk = sdk_version),
tools = ["//compiler/damlc"],

2
triggers/tests/BUILD.bazel
View File

@ -59,7 +59,7 @@ dependencies:
- daml-script.dar
EOF
test -z "{lf_version}" || echo "build-options: [--target={lf_version}]" >> $$TMP_DIR/daml.yaml
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror --ghc-option=-Wno-error=missing-signatures -o $$PWD/$(location acs{suffix}.dar)
$(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location acs{suffix}.dar)
rm -rf $$TMP_DIR
""".format(
sdk = sdk_version,