Commit dc2b020b authored by Mikhail Glushenkov's avatar Mikhail Glushenkov Committed by GitHub
Browse files

Merge pull request #3797 from ezyang/pr/remove-world

Remove deprecated/obsolete projectConfigWorldFile, fixes #3749.
parents 9dbdf072 dec83c2a
......@@ -391,7 +391,7 @@ convertLegacyBuildOnlyFlags globalFlags configFlags
GlobalFlags {
globalCacheDir = projectConfigCacheDir,
globalLogsDir = projectConfigLogsDir,
globalWorldFile = projectConfigWorldFile,
globalWorldFile = _,
globalHttpTransport = projectConfigHttpTransport,
globalIgnoreExpiry = projectConfigIgnoreExpiry
} = globalFlags
......@@ -468,7 +468,7 @@ convertToLegacySharedConfig
globalCacheDir = projectConfigCacheDir,
globalLocalRepos = projectConfigLocalRepos,
globalLogsDir = projectConfigLogsDir,
globalWorldFile = projectConfigWorldFile,
globalWorldFile = mempty,
globalRequireSandbox = mempty,
globalIgnoreSandbox = mempty,
globalIgnoreExpiry = projectConfigIgnoreExpiry,
......@@ -787,7 +787,7 @@ legacySharedConfigFieldDescrs =
]
. filterFields
[ "remote-repo-cache"
, "logs-dir", "world-file", "ignore-expiry", "http-transport"
, "logs-dir", "ignore-expiry", "http-transport"
]
. commandOptionsToFields
) (commandOptions (globalCommand []) ParseArgs)
......
......@@ -135,8 +135,7 @@ data ProjectConfigBuildOnly
projectConfigHttpTransport :: Flag String,
projectConfigIgnoreExpiry :: Flag Bool,
projectConfigCacheDir :: Flag FilePath,
projectConfigLogsDir :: Flag FilePath,
projectConfigWorldFile :: Flag FilePath
projectConfigLogsDir :: Flag FilePath
}
deriving (Eq, Show, Generic)
......
......@@ -305,19 +305,18 @@ instance Arbitrary ProjectConfigBuildOnly where
<*> arbitrary
<*> (fmap getShortToken <$> arbitrary)
<*> (fmap getShortToken <$> arbitrary)
<*> (fmap getShortToken <$> arbitrary)
where
arbitraryNumJobs = fmap (fmap getPositive) <$> arbitrary
shrink (ProjectConfigBuildOnly
x00 x01 x02 x03 x04 x05 x06 x07
x08 x09 x10 x11 x12 x13 x14 x15
x16 x17) =
x16) =
[ ProjectConfigBuildOnly
x00' x01' x02' x03' x04'
x05' x06' x07' x08' (postShrink_NumJobs x09')
x10' x11' x12' x13 x14'
x15 x16 x17
x15 x16
| ((x00', x01', x02', x03', x04'),
(x05', x06', x07', x08', x09'),
(x10', x11', x12', x14'))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment