Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove no longer needed git submodule update #1145

Merged
merged 4 commits into from
Jan 4, 2021
Merged

Remove no longer needed git submodule update #1145

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
788cc36
Remove no longer needed git submodule update
jhrcek Jan 2, 2021
b1a99c3
Merge branch 'master' into cleanup-submodule
jhrcek Jan 2, 2021
8accacb
Merge branch 'master' into cleanup-submodule
jhrcek Jan 2, 2021
9461962
Merge branch 'master' into cleanup-submodule
jneira Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions install/src/HlsInstall.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ defaultMain = do

want ["short-help"]
-- general purpose targets
phony "submodules" updateSubmodules
phony "short-help" shortHelpMessage
phony "help" (helpMessage toolsVersions)

phony "check" (if isRunFromStack then checkStack args else checkCabal_ args)

phony "data" $ do
need ["show-options"]
need ["submodules"]
need ["check"]
liftIO $ putStrLn "Generation of hoogle data files is disabled for now."
-- if isRunFromStack then stackBuildData args else cabalBuildData args
Expand All @@ -60,7 +58,6 @@ defaultMain = do
versions
(\version -> phony ("hls-" ++ version) $ do
need ["show-options"]
need ["submodules"]
need ["check"]
if isRunFromStack then
stackInstallHlsWithErrMsg (Just version) args
Expand Down Expand Up @@ -104,9 +101,3 @@ buildIcuMacosFix version args = execStackWithGhc_
, "--extra-lib-dirs=/usr/local/opt/icu4c/lib"
, "--extra-include-dirs=/usr/local/opt/icu4c/include"
] ++ args

-- | update the submodules that the project is in the state as required by the `stack.yaml` files
updateSubmodules :: Action ()
updateSubmodules = do
command_ [] "git" ["submodule", "sync"]
command_ [] "git" ["submodule", "update", "--init"]