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
6f1b8b40
Verified
Commit
6f1b8b40
authored
4 years ago
by
Julian Ospald
Browse files
Options
Downloads
Patches
Plain Diff
Fix build on 32bit
parent
f63b2bf7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!28
Cabal install 3.4.0.0 rc1
Pipeline
#23282
canceled
4 years ago
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+3
-0
3 additions, 0 deletions
.gitlab-ci.yml
.gitlab/script/ghcup_version.sh
+9
-3
9 additions, 3 deletions
.gitlab/script/ghcup_version.sh
ghcup-0.0.2.yaml
+6
-2
6 additions, 2 deletions
ghcup-0.0.2.yaml
ghcup.cabal
+1
-1
1 addition, 1 deletion
ghcup.cabal
with
19 additions
and
6 deletions
.gitlab-ci.yml
+
3
−
0
View file @
6f1b8b40
...
...
@@ -14,6 +14,7 @@ variables:
-
x86_64-linux
variables
:
OS
:
"
LINUX"
BIT
:
"
64"
.alpine:64bit
:
image
:
"
alpine:edge"
...
...
@@ -36,12 +37,14 @@ variables:
-
x86_64-darwin
variables
:
OS
:
"
DARWIN"
BIT
:
"
64"
.freebsd
:
tags
:
-
x86_64-freebsd
variables
:
OS
:
"
FREEBSD"
BIT
:
"
64"
.root_cleanup
:
after_script
:
...
...
This diff is collapsed.
Click to expand it.
.gitlab/script/ghcup_version.sh
+
9
−
3
View file @
6f1b8b40
...
...
@@ -22,14 +22,20 @@ ecabal update
if
[
"
${
OS
}
"
=
"DARWIN"
]
;
then
ecabal build
-w
ghc-
${
GHC_VERSION
}
-ftui
elif
[
"
${
OS
}
"
=
"LINUX"
]
;
then
if
[
"
${
BIT
}
"
=
"32"
]
;
then
ecabal build
-w
ghc-
${
GHC_VERSION
}
-finternal-downloader
-ftui
-ftar
else
ecabal build
-w
ghc-
${
GHC_VERSION
}
-finternal-downloader
-ftui
fi
else
ecabal build
-w
ghc-
${
GHC_VERSION
}
-finternal-downloader
-ftui
fi
ecabal haddock
ecabal haddock
-w
ghc-
${
GHC_VERSION
}
-ftar
cp
"
$(
ecabal new-exec
--enable-tests
--verbose
=
0
--offline
sh
--
-c
'command -v ghcup'
)
"
.
cp
"
$(
ecabal new-exec
--enable-tests
--verbose
=
0
--offline
sh
--
-c
'command -v ghcup-gen'
)
"
.
cp
"
$(
ecabal new-exec
-w
ghc-
${
GHC_VERSION
}
--enable-tests
--verbose
=
0
--offline
sh
--
-c
'command -v ghcup'
)
"
.
cp
"
$(
ecabal new-exec
-w
ghc-
${
GHC_VERSION
}
--enable-tests
--verbose
=
0
--offline
sh
--
-c
'command -v ghcup-gen'
)
"
.
cp
./ghcup
"
$CI_PROJECT_DIR
"
/.local/bin/ghcup
cp
./ghcup-gen
"
$CI_PROJECT_DIR
"
/.local/bin/ghcup-gen
...
...
This diff is collapsed.
Click to expand it.
ghcup-0.0.2.yaml
+
6
−
2
View file @
6f1b8b40
...
...
@@ -1305,7 +1305,7 @@ ghcupDownloads:
viArch
:
A_64
:
Linux_UnknownLinux
:
unknown_versioning
:
unknown_versioning
:
&ghcup-64
dlUri
:
https://downloads.haskell.org/~ghcup/0.1.8/x86_64-linux-ghcup-0.1.8
dlHash
:
7ffcd4c3de156e895b648c75a36c762be2a4932883f3cd598f7a483c97d4a8a9
Darwin
:
...
...
@@ -1316,8 +1316,12 @@ ghcupDownloads:
unknown_versioning
:
dlUri
:
https://downloads.haskell.org/~ghcup/0.1.8/x86_64-portbld-freebsd-ghcup-0.1.8
dlHash
:
442cdfe1b4525a327d9566e6270f909f7deba21c16dd4c7912537cf67e6cd521
Linux_Alpine
:
unknown_versioning
:
*ghcup-64
A_32
:
Linux_UnknownLinux
:
unknown_versioning
:
unknown_versioning
:
&ghcup-32
dlUri
:
https://downloads.haskell.org/~ghcup/0.1.8/i386-linux-ghcup-0.1.8
dlHash
:
18ab162920cea662feae4b08f39d3879e9e416fde7b734afd8072c39d3c43cde
Linux_Alpine
:
unknown_versioning
:
*ghcup-32
This diff is collapsed.
Click to expand it.
ghcup.cabal
+
1
−
1
View file @
6f1b8b40
...
...
@@ -112,7 +112,7 @@ common io-streams
build-depends: io-streams >=1.5
common libarchive
build-depends: libarchive >= 2.2.5.
2
build-depends: libarchive >= 2.2.5.
0
common lzma
build-depends: lzma >=0.0.0.3
...
...
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