From 7b7a6f6211cc4f9bb02638be9af0183abe8c89d4 Mon Sep 17 00:00:00 2001 From: Remy Date: Tue, 20 Jun 2023 16:28:50 +0200 Subject: [PATCH] Reactivate windows tests disable in #16760 (#16958) namely: - //daml-script/export/integration-tests/reproduces-transactions:test - //compiler/damlc:daml-stdlib-doctest Co-authored-by: Gary Verhaegen --- compiler/damlc/BUILD.bazel | 2 +- compiler/damlc/lib/DA/Cli/Damlc.hs | 185 +++++++++++++++--- compiler/damlc/lib/DA/Cli/Damlc/Packaging.hs | 24 +-- .../reproduces-transactions/BUILD.bazel | 3 +- infra/windows_azure.tf | 2 +- infra/windows_startup.ps1 | 1 + 6 files changed, 170 insertions(+), 47 deletions(-) diff --git a/compiler/damlc/BUILD.bazel b/compiler/damlc/BUILD.bazel index b40a91ff434..8ffcc3c0a10 100644 --- a/compiler/damlc/BUILD.bazel +++ b/compiler/damlc/BUILD.bazel @@ -349,4 +349,4 @@ daml_doc_test( "DA/Time/Types.daml", "DA/Action/State/Type.daml", ], -) if not is_windows else None +) diff --git a/compiler/damlc/lib/DA/Cli/Damlc.hs b/compiler/damlc/lib/DA/Cli/Damlc.hs index 0ecdb912276..8d1799cbb00 100644 --- a/compiler/damlc/lib/DA/Cli/Damlc.hs +++ b/compiler/damlc/lib/DA/Cli/Damlc.hs @@ -10,23 +10,66 @@ module DA.Cli.Damlc (main) where import qualified "zip-archive" Codec.Archive.Zip as ZipArchive -import Control.Exception +import Control.Exception (catch, handle) import Control.Exception.Safe (catchIO) -import Control.Monad.Except +import Control.Monad.Except (forM, forM_, liftIO, unless, void, when) import Control.Monad.Extra (whenM, whenJust) -import DA.Bazel.Runfiles +import DA.Bazel.Runfiles (Resource(..), + locateResource, + mainWorkspace, + resourcesPath, + runfilesPathPrefix, + setRunfilesEnv) import qualified DA.Cli.Args as ParseArgs -import DA.Cli.Options -import DA.Cli.Damlc.BuildInfo +import DA.Cli.Options (Debug(..), + InitPkgDb(..), + ProjectOpts(..), + Style(..), + Telemetry(..), + debugOpt, + disabledDlintUsageParser, + enabledDlintUsageParser, + enableScenarioServiceOpt, + incrementalBuildOpt, + initPkgDbOpt, + inputDarOpt, + inputFileOpt, + inputFileOptWithExt, + optionalDlintUsageParser, + optionalOutputFileOpt, + optionsParser, + optPackageName, + outputFileOpt, + packageNameOpt, + projectOpts, + render, + studioAutorunAllScenariosOpt, + targetFileNameOpt, + telemetryOpt) +import DA.Cli.Damlc.BuildInfo (buildInfo) import qualified DA.Daml.Dar.Reader as InspectDar import qualified DA.Cli.Damlc.Command.Damldoc as Damldoc -import DA.Cli.Damlc.Packaging -import DA.Cli.Damlc.DependencyDb -import DA.Cli.Damlc.Test -import DA.Daml.Compiler.Dar -import DA.Daml.Compiler.Output +import DA.Cli.Damlc.Packaging (createProjectPackageDb, mbErr) +import DA.Cli.Damlc.DependencyDb (installDependencies) +import DA.Cli.Damlc.Test (CoveragePaths(..), + LoadCoverageOnly(..), + RunAllTests(..), + ShowCoverage(..), + TableOutputPath(..), + TransactionsOutputPath(..), + UseColor(..), + execTest, + getRunAllTests, + loadAggregatePrintResults) +import DA.Daml.Compiler.Dar (FromDalf(..), + breakAt72Bytes, + buildDar, + createDarFile, + getDamlRootFiles, + writeIfacesAndHie) +import DA.Daml.Compiler.Output (diagnosticsLogger, writeOutput, writeOutputBSL) import qualified DA.Daml.Compiler.Repl as Repl -import DA.Daml.Compiler.DocTest +import DA.Daml.Compiler.DocTest (docTest) import DA.Daml.Desugar (desugar) import DA.Daml.LF.ScenarioServiceClient (readScenarioServiceConfig, withScenarioService') import qualified DA.Daml.LF.ReplClient as ReplClient @@ -34,18 +77,60 @@ import DA.Daml.Compiler.Validate (validateDar) import qualified DA.Daml.LF.Ast as LF import DA.Daml.LF.Ast.Util (splitUnitId) import qualified DA.Daml.LF.Proto3.Archive as Archive -import DA.Daml.LF.Reader -import DA.Daml.LanguageServer -import DA.Daml.Options.Types -import DA.Daml.Package.Config -import DA.Daml.Project.Config -import DA.Daml.Project.Consts +import DA.Daml.LF.Reader (dalfPaths, + mainDalf, + mainDalfPath, + manifestPath, + readDalfManifest, + readDalfs, + readManifest) +import DA.Daml.LanguageServer (runLanguageServer) +import DA.Daml.Options.Types (EnableScenarioService(..), + Haddock(..), + IncrementalBuild, + Options, + SkipScenarioValidation(..), + StudioAutorunAllScenarios, + damlArtifactDir, + distDir, + getLogger, + ifaceDir, + optDamlLfVersion, + optEnableOfInterestRule, + optEnableScenarios, + optHaddock, + optIfaceDir, + optImportPath, + optIncrementalBuild, + optMbPackageName, + optMbPackageVersion, + optPackageDbs, + optPackageImports, + optScenarioService, + optSkipScenarioValidation, + optThreads, + pkgNameVersion, + projectPackageDatabase) +import DA.Daml.Package.Config (PackageConfigFields(..), + PackageSdkVersion(..), + checkPkgConfig, + withPackageConfig) +import DA.Daml.Project.Config (queryProjectConfigRequired, readProjectConfig) +import DA.Daml.Project.Consts (ProjectCheck(..), + damlCacheEnvVar, + damlPathEnvVar, + getProjectPath, + getSdkVersion, + projectConfigName, + sdkVersionEnvVar, + withExpectProjectRoot, + withProjectRoot) import DA.Daml.Project.Types (ConfigError(..), ProjectPath(..)) import qualified DA.Pretty import qualified DA.Service.Logger as Logger import qualified DA.Service.Logger.Impl.GCP as Logger.GCP import qualified DA.Service.Logger.Impl.IO as Logger.IO -import DA.Signals +import DA.Signals (installSignalHandlers) import qualified Com.Daml.DamlLfDev.DamlLf as PLF import qualified Data.Aeson.Encode.Pretty as Aeson.Pretty import qualified Data.Aeson.Text as Aeson @@ -56,27 +141,66 @@ import qualified Data.ByteString.Lazy.Char8 as BSLC import qualified Data.ByteString.UTF8 as BSUTF8 import Data.FileEmbed (embedFile) import qualified Data.HashSet as HashSet -import Data.List.Extra +import Data.List.Extra (nubOrd, nubSort, nubSortOn) import qualified Data.List.Split as Split import qualified Data.Map.Strict as Map -import Data.Maybe +import Data.Maybe (catMaybes, fromMaybe, mapMaybe) import qualified Data.Text.Extended as T import qualified Data.Text.Lazy.IO as TL import qualified Data.Text.IO as T -import Development.IDE.Core.API -import Development.IDE.Core.Debouncer -import Development.IDE.Core.IdeState.Daml -import Development.IDE.Core.Rules +import Development.IDE.Core.API (getDalf, runActionSync, setFilesOfInterest) +import Development.IDE.Core.Debouncer (newAsyncDebouncer) +import Development.IDE.Core.IdeState.Daml (getDamlIdeState, + enabledPlugins, + withDamlIdeState) +import Development.IDE.Core.Rules (transitiveModuleDeps) import Development.IDE.Core.Rules.Daml (getDlintIdeas, getSpanInfo) -import Development.IDE.Core.Shake +import Development.IDE.Core.Shake (Config(..), + NotificationHandler(..), + ShakeLspEnv(..), + getDiagnostics, + use, + use_, + uses) import Development.IDE.GHC.Util (hscEnv, moduleImportPath) -import Development.IDE.Types.Location -import "ghc-lib-parser" DynFlags -import GHC.Conc +import Development.IDE.Types.Location (toNormalizedFilePath') +import "ghc-lib-parser" DynFlags (DumpFlag(..), + ModRenaming(..), + PackageArg(..), + PackageFlag(..)) +import GHC.Conc (getNumProcessors) import "ghc-lib-parser" Module (unitIdString, stringToUnitId) import qualified Network.Socket as NS -import Options.Applicative.Extended -import Options.Applicative hiding (option, strOption) +import Options.Applicative.Extended (flagYesNoAuto, optionOnce, strOptionOnce) +import Options.Applicative ((<|>), + CommandFields, + Mod, + Parser, + ParserInfo, + auto, + command, + eitherReader, + flag, + flag', + fullDesc, + handleParseResult, + headerDoc, + help, + helper, + info, + internal, + liftA2, + long, + many, + metavar, + optional, + progDesc, + short, + str, + strArgument, + subparser, + switch, + value) import qualified Options.Applicative (option, strOption) import qualified Proto3.Suite as PS import qualified Proto3.Suite.JSONPB as Proto.JSONPB @@ -1020,7 +1144,6 @@ execDocTest opts scriptDar (ImportSource importSource) files = { optImportPath = importPaths <> optImportPath opts , optHaddock = Haddock True } - withDamlIdeState opts logger diagnosticsLogger $ \ideState -> docTest ideState files' diff --git a/compiler/damlc/lib/DA/Cli/Damlc/Packaging.hs b/compiler/damlc/lib/DA/Cli/Damlc/Packaging.hs index d65d994fe60..4291be00655 100644 --- a/compiler/damlc/lib/DA/Cli/Damlc/Packaging.hs +++ b/compiler/damlc/lib/DA/Cli/Damlc/Packaging.hs @@ -16,16 +16,16 @@ module DA.Cli.Damlc.Packaging import Control.Exception.Safe (tryAny) import Control.Lens (none, toListOf) -import Control.Monad.Extra +import Control.Monad.Extra (forM_, fromMaybeM, when) import Control.Monad.IO.Class (liftIO) -import Control.Monad.Trans.Maybe +import Control.Monad.Trans.Maybe (runMaybeT) import qualified Control.Monad.Trans.State.Strict as State import qualified Data.ByteString as BS -import Data.Either.Combinators -import Data.Graph -import Data.List.Extra +import Data.Either.Combinators (whenLeft) +import Data.Graph (Graph, Vertex, graphFromEdges, reachable, topSort, transposeG, vertices) +import Data.List.Extra ((\\), intercalate, nubSortOn) import qualified Data.Map.Strict as MS -import Data.Maybe +import Data.Maybe (fromMaybe, isNothing) import qualified Data.NameMap as NM import Data.Set (Set) import qualified Data.Set as Set @@ -34,17 +34,17 @@ import Data.Tuple.Extra (fst3) import Development.IDE.Core.Rules (useE, useNoFileE) import Development.IDE.Core.Service (runActionSync) import Development.IDE.GHC.Util (hscEnv) -import Development.IDE.Types.Location +import Development.IDE.Types.Location (NormalizedFilePath, fromNormalizedFilePath, toNormalizedFilePath') import "ghc-lib-parser" DynFlags (DynFlags) -import GHC.Fingerprint +import GHC.Fingerprint (Fingerprint, fingerprintFingerprints, getFileHash) import "ghc-lib-parser" HscTypes as GHC import "ghc-lib-parser" Module (UnitId, unitIdString) import qualified Module as GHC import qualified "ghc-lib-parser" Packages as GHC -import System.Directory.Extra +import System.Directory.Extra (copyFile, createDirectoryIfMissing, listFilesRecursive, removePathForcibly) import System.Exit import System.FilePath -import System.IO.Extra +import System.IO.Extra (hFlush, hPutStrLn, stderr, writeFileUTF8) import System.Info.Extra import System.Process (callProcess) import "ghc-lib-parser" UniqSet @@ -165,11 +165,11 @@ createProjectPackageDb projectRoot (disableScenarioService -> opts) modulePrefix forM_ (topSort $ transposeG depGraph) $ \vertex -> do let (pkgNode, pkgId) = vertexToNode vertex case pkgNode of - MkStableDependencyPackageNode -> + MkStableDependencyPackageNode -> do -- stable packages are mapped to the current version of daml-prim/daml-stdlib -- so we don’t need to generate interface files for them. pure () - MkBuiltinDependencyPackageNode {} -> + MkBuiltinDependencyPackageNode {} -> do pure () MkDependencyPackageNode DependencyPackageNode {dalf, unitId, dalfPackage} -> do liftIO $ registerDepInPkgDb dalf depsDir dbPath diff --git a/daml-script/export/integration-tests/reproduces-transactions/BUILD.bazel b/daml-script/export/integration-tests/reproduces-transactions/BUILD.bazel index d2acc1cc2de..94dadc81ed5 100644 --- a/daml-script/export/integration-tests/reproduces-transactions/BUILD.bazel +++ b/daml-script/export/integration-tests/reproduces-transactions/BUILD.bazel @@ -6,7 +6,6 @@ load( "da_scala_test", "lf_scalacopts_stricter", ) -load("@os_info//:os_info.bzl", "is_windows") da_scala_test( name = "test", @@ -55,4 +54,4 @@ da_scala_test( "@maven//:io_netty_netty_handler", "@maven//:org_scalatest_scalatest_compatible", ], -) if not is_windows else None +) diff --git a/infra/windows_azure.tf b/infra/windows_azure.tf index 63c302ae182..124d2eb79be 100644 --- a/infra/windows_azure.tf +++ b/infra/windows_azure.tf @@ -40,7 +40,7 @@ EOF source_image_reference { publisher = "MicrosoftWindowsServer" offer = "WindowsServer" - sku = "2022-datacenter" + sku = "2016-datacenter" version = "latest" } diff --git a/infra/windows_startup.ps1 b/infra/windows_startup.ps1 index 69d9d1b6a67..7906b179429 100644 --- a/infra/windows_startup.ps1 +++ b/infra/windows_startup.ps1 @@ -23,6 +23,7 @@ New-ItemProperty -Path HKLM:Software\Microsoft\Windows\CurrentVersion\policies\s ${gcp_logging} # Install chocolatey [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$env:chocolateyVersion = '1.4.0' iex (New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1') # Install git, bash