Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Jean-Baptiste Mazon
GHC
Commits
8565f808
Commit
8565f808
authored
5 years ago
by
Ben Gamari
Browse files
Options
Downloads
Patches
Plain Diff
gitlab-ci: pxz is unavailable on CentOS 7
Fall back to xz
parent
2645505f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
.gitlab/prepare-system.sh
+2
-1
2 additions, 1 deletion
.gitlab/prepare-system.sh
with
4 additions
and
1 deletion
.gitlab-ci.yml
+
2
−
0
View file @
8565f808
...
@@ -699,6 +699,8 @@ release-x86_64-linux-centos7:
...
@@ -699,6 +699,8 @@ release-x86_64-linux-centos7:
BUILD_SPHINX_PDF
:
"
NO"
BUILD_SPHINX_PDF
:
"
NO"
TEST_ENV
:
"
x86_64-linux-centos7"
TEST_ENV
:
"
x86_64-linux-centos7"
BIN_DIST_PREP_TAR_COMP
:
"
ghc-x86_64-centos7-linux.tar.xz"
BIN_DIST_PREP_TAR_COMP
:
"
ghc-x86_64-centos7-linux.tar.xz"
# pxz is not available on centos7 for reasons I can't understand
XZ
:
"
xz"
only
:
only
:
-
tags
-
tags
cache
:
cache
:
...
...
This diff is collapsed.
Click to expand it.
.gitlab/prepare-system.sh
+
2
−
1
View file @
8565f808
...
@@ -13,6 +13,7 @@ if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi
...
@@ -13,6 +13,7 @@ if [[ -z ${BUILD_SPHINX_HTML:-} ]]; then BUILD_SPHINX_HTML=YES; fi
if
[[
-z
${
BUILD_SPHINX_PDF
:-}
]]
;
then
BUILD_SPHINX_PDF
=
YES
;
fi
if
[[
-z
${
BUILD_SPHINX_PDF
:-}
]]
;
then
BUILD_SPHINX_PDF
=
YES
;
fi
if
[[
-z
${
INTEGER_LIBRARY
:-}
]]
;
then
INTEGER_LIBRARY
=
integer-gmp
;
fi
if
[[
-z
${
INTEGER_LIBRARY
:-}
]]
;
then
INTEGER_LIBRARY
=
integer-gmp
;
fi
if
[[
-z
${
BUILD_FLAVOUR
:-}
]]
;
then
BUILD_FLAVOUR
=
perf
;
fi
if
[[
-z
${
BUILD_FLAVOUR
:-}
]]
;
then
BUILD_FLAVOUR
=
perf
;
fi
if
[[
-z
${
XZ
:-}
]]
;
then
XZ
=
pxz
;
fi
cat
>
mk/build.mk
<<
EOF
cat
>
mk/build.mk
<<
EOF
V=1
V=1
...
@@ -23,7 +24,7 @@ BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
...
@@ -23,7 +24,7 @@ BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
BUILD_SPHINX_PDF=
$BUILD_SPHINX_PDF
BUILD_SPHINX_PDF=
$BUILD_SPHINX_PDF
BeConservative=YES
BeConservative=YES
INTEGER_LIBRARY=
$INTEGER_LIBRARY
INTEGER_LIBRARY=
$INTEGER_LIBRARY
XZ_CMD=
pxz
XZ_CMD=
$XZ
EOF
EOF
cat
<<
EOF
>> mk/build.mk
cat
<<
EOF
>> mk/build.mk
...
...
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