Don't do single-package checks if typecheck-upgrades: true

digital-asset · May 28, 2024 · 4d02b07 · 4d02b07
1 parent 572f119
commit 4d02b07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sdk/compiler/daml-lf-tools/src/DA/Daml/LF/TypeChecker/Upgrade.hs b/sdk/compiler/daml-lf-tools/src/DA/Daml/LF/TypeChecker/Upgrade.hs
@@ -92,10 +92,11 @@ checkUpgrade version shouldTypecheckUpgrades warnBadInterfaceInstances presentPk
         singlePkgDiagnostics =
             let world = initWorldSelf [] presentPkg
             in
-            runGamma world version $ do
-                local addBadIfaceSwapIndicator $ do
-                    checkNewInterfacesAreUnused presentPkg
-                    checkNewInterfacesHaveNoTemplates presentPkg
+            runGamma world version $
+                local addBadIfaceSwapIndicator $
+                    when shouldTypecheckUpgrades $ do
+                        checkNewInterfacesAreUnused presentPkg
+                        checkNewInterfacesHaveNoTemplates presentPkg
 
         extractDiagnostics :: Either Error ((), [Warning]) -> [Diagnostic]
         extractDiagnostics result =

diff --git a/sdk/daml-script/test/BUILD.bazel b/sdk/daml-script/test/BUILD.bazel
@@ -72,6 +72,7 @@ dependencies:
 build-options:
   - --target={target}
   - --enable-interfaces=yes
+typecheck-upgrades: false
 EOF
       $(location //compiler/damlc) build --project-root=$$TMP_DIR --ghc-option=-Werror -o $$PWD/$(location script{scriptVersion}-test-v{name}.dar)
       rm -rf $$TMP_DIR