Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
ghcup-hs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
ghcup-hs
Commits
e60b8ee2
Verified
Commit
e60b8ee2
authored
3 years ago
by
Julian Ospald
Browse files
Options
Downloads
Plain Diff
Merge branch 'CIi'
parents
8004cc05
dc0ea5a5
No related branches found
No related tags found
1 merge request
!256
Fix CI
Pipeline
#51745
passed
3 years ago
Stage: checks
Stage: quick-test
Stage: test
Stage: expensive-test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab/script/ghcup_version.sh
+2
-0
2 additions, 0 deletions
.gitlab/script/ghcup_version.sh
app/ghcup/GHCup/OptParse/Compile.hs
+4
-4
4 additions, 4 deletions
app/ghcup/GHCup/OptParse/Compile.hs
app/ghcup/GHCup/OptParse/Install.hs
+7
-7
7 additions, 7 deletions
app/ghcup/GHCup/OptParse/Install.hs
with
13 additions
and
11 deletions
.gitlab/script/ghcup_version.sh
+
2
−
0
View file @
e60b8ee2
...
@@ -217,6 +217,8 @@ if [ "${OS}" = "LINUX" ] ; then
...
@@ -217,6 +217,8 @@ if [ "${OS}" = "LINUX" ] ; then
fi
fi
fi
fi
eghcup gc
-c
sha_sum
()
{
sha_sum
()
{
if
[
"
${
OS
}
"
=
"FREEBSD"
]
;
then
if
[
"
${
OS
}
"
=
"FREEBSD"
]
;
then
sha256
"
$@
"
sha256
"
$@
"
...
...
This diff is collapsed.
Click to expand it.
app/ghcup/GHCup/OptParse/Compile.hs
+
4
−
4
View file @
e60b8ee2
...
@@ -99,7 +99,7 @@ data HLSCompileOptions = HLSCompileOptions
...
@@ -99,7 +99,7 @@ data HLSCompileOptions = HLSCompileOptions
--[ Parsers ]--
--[ Parsers ]--
---------------
---------------
compileP
::
Parser
CompileCommand
compileP
::
Parser
CompileCommand
compileP
=
subparser
compileP
=
subparser
(
command
(
command
...
@@ -541,11 +541,11 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
...
@@ -541,11 +541,11 @@ compile compileCommand settings Dirs{..} runAppState runLogger = do
pure
ExitSuccess
pure
ExitSuccess
VLeft
(
V
(
AlreadyInstalled
_
v
))
->
do
VLeft
(
V
(
AlreadyInstalled
_
v
))
->
do
runLogger
$
logWarn
$
runLogger
$
logWarn
$
"GHC ver "
<>
prettyVer
v
<>
" already installed
; if you really want to reinstall it, you may want to run 'ghcup install ghc --force "
<>
prettyVer
v
<>
"'
"
"GHC ver "
<>
prettyVer
v
<>
" already installed
, remove it first to reinstall
"
pure
ExitSuccess
pure
ExitSuccess
VLeft
(
V
(
DirNotEmpty
fp
))
->
do
VLeft
(
V
(
DirNotEmpty
fp
))
->
do
runLogger
$
log
Warn
$
runLogger
$
log
Error
$
"Install directory "
<>
T
.
pack
fp
<>
" is not empty.
Use 'ghcup install ghc --isolate "
<>
T
.
pack
fp
<>
" --force ..."
<>
"' to install regardless.
"
"Install directory "
<>
T
.
pack
fp
<>
" is not empty."
pure
$
ExitFailure
3
pure
$
ExitFailure
3
VLeft
err
@
(
V
(
BuildFailed
tmpdir
_
))
->
do
VLeft
err
@
(
V
(
BuildFailed
tmpdir
_
))
->
do
case
keepDirs
settings
of
case
keepDirs
settings
of
...
...
This diff is collapsed.
Click to expand it.
app/ghcup/GHCup/OptParse/Install.hs
+
7
−
7
View file @
e60b8ee2
...
@@ -210,7 +210,7 @@ installOpts tool =
...
@@ -210,7 +210,7 @@ installOpts tool =
)
)
)
)
<*>
switch
<*>
switch
(
short
'f'
<>
long
"force"
<>
help
"Force install"
)
(
short
'f'
<>
long
"force"
<>
help
"Force install
(THIS IS UNSAFE, only use it in Dockerfiles or CI)
"
)
where
where
setDefault
=
case
tool
of
setDefault
=
case
tool
of
Nothing
->
False
Nothing
->
False
...
@@ -421,20 +421,20 @@ install installCommand settings getAppState' runLogger = case installCommand of
...
@@ -421,20 +421,20 @@ install installCommand settings getAppState' runLogger = case installCommand of
VLeft
(
V
(
AlreadyInstalled
_
v
,
()
))
->
do
VLeft
(
V
(
AlreadyInstalled
_
v
,
()
))
->
do
runLogger
$
logWarn
$
runLogger
$
logWarn
$
"GHC ver "
<>
prettyVer
v
<>
" already installed
; if you really want to reinstall it, you may want to run 'ghcup install ghc --force "
<>
prettyVer
v
<>
"'
"
"GHC ver "
<>
prettyVer
v
<>
" already installed
, remove it first to reinstall
"
pure
ExitSuccess
pure
ExitSuccess
VLeft
(
V
(
AlreadyInstalled
_
v
))
->
do
VLeft
(
V
(
AlreadyInstalled
_
v
))
->
do
runLogger
$
logWarn
$
runLogger
$
logWarn
$
"GHC ver "
<>
prettyVer
v
<>
" already installed
; if you really want to reinstall it, you may want to run 'ghcup install ghc --force "
<>
prettyVer
v
<>
"'
"
"GHC ver "
<>
prettyVer
v
<>
" already installed
, remove it first to reinstall
"
pure
ExitSuccess
pure
ExitSuccess
VLeft
(
V
(
DirNotEmpty
fp
))
->
do
VLeft
(
V
(
DirNotEmpty
fp
))
->
do
runLogger
$
log
Warn
$
runLogger
$
log
Error
$
"Install directory "
<>
T
.
pack
fp
<>
" is not empty.
Use 'ghcup install ghc --isolate "
<>
T
.
pack
fp
<>
" --force ..."
<>
"' to install regardless.
"
"Install directory "
<>
T
.
pack
fp
<>
" is not empty."
pure
$
ExitFailure
3
pure
$
ExitFailure
3
VLeft
(
V
(
DirNotEmpty
fp
,
()
))
->
do
VLeft
(
V
(
DirNotEmpty
fp
,
()
))
->
do
runLogger
$
log
Warn
$
runLogger
$
log
Error
$
"Install directory "
<>
T
.
pack
fp
<>
" is not empty.
Use 'ghcup install ghc --isolate "
<>
T
.
pack
fp
<>
" --force ..."
<>
"' to install regardless.
"
"Install directory "
<>
T
.
pack
fp
<>
" is not empty."
pure
$
ExitFailure
3
pure
$
ExitFailure
3
VLeft
err
@
(
V
(
BuildFailed
tmpdir
_
))
->
do
VLeft
err
@
(
V
(
BuildFailed
tmpdir
_
))
->
do
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment