[Git][ghc/ghc][wip/rocky-ci] 2 commits: configure: Drop FP_PROG_CONTEXT_DIFF
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Wed Jan 11 16:24:18 UTC 2023
Ben Gamari pushed to branch wip/rocky-ci at Glasgow Haskell Compiler / GHC
Commits:
75d287c4 by Ben Gamari at 2023-01-11T11:24:10-05:00
configure: Drop FP_PROG_CONTEXT_DIFF
The result of this configure check is not used.
- - - - -
34563a65 by Ben Gamari at 2023-01-11T11:24:10-05:00
gitlab-ci: Add Rocky8 jobs
Addresses #22268.
- - - - -
5 changed files:
- .gitlab-ci.yml
- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml
- configure.ac
- − m4/fp_prog_context_diff.m4
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -2,7 +2,7 @@ variables:
GIT_SSL_NO_VERIFY: "1"
# Commit of ghc/ci-images repository from which to pull Docker images
- DOCKER_REV: 0de79b7676de197f5d4b79f22a8220a7d563a427
+ DOCKER_REV: 3d0a10fa218be2f5e3cc0e68717c0b1a6d2909ad
# Sequential version number of all cached things.
# Bump to invalidate GitLab CI cache.
=====================================
.gitlab/gen_ci.hs
=====================================
@@ -99,7 +99,13 @@ data Opsys
| Windows deriving (Eq)
data LinuxDistro
- = Debian11 | Debian10 | Debian9 | Fedora33 | Ubuntu2004 | Centos7 | Alpine deriving (Eq)
+ = Debian11 | Debian10 | Debian9
+ | Fedora33
+ | Ubuntu2004
+ | Centos7
+ | Alpine
+ | Rocky8
+ deriving (Eq)
data Arch = Amd64 | AArch64 | I386
@@ -255,6 +261,7 @@ distroName Fedora33 = "fedora33"
distroName Ubuntu2004 = "ubuntu20_04"
distroName Centos7 = "centos7"
distroName Alpine = "alpine3_12"
+distroName Rocky8 = "rocky8"
opsysName :: Opsys -> String
opsysName (Linux distro) = "linux-" ++ distroName distro
@@ -398,6 +405,9 @@ distroVariables Alpine = mconcat
distroVariables Centos7 = mconcat [
"HADRIAN_ARGS" =: "--docs=no-sphinx"
]
+distroVariables Rocky8 = mconcat [
+ "HADRIAN_ARGS" =: "--docs=no-sphinx"
+ ]
distroVariables Fedora33 = mconcat
-- LLC/OPT do not work for some reason in our fedora images
-- These tests fail with this error: T11649 T5681 T7571 T8131b
@@ -823,6 +833,7 @@ jobs = Map.fromList $ concatMap flattenJobGroup $
)
{ bignumBackend = Native
}
+ , standardBuilds Amd64 (Linux Rocky8)
]
where
=====================================
.gitlab/jobs.yaml
=====================================
@@ -1685,6 +1685,66 @@
"XZ_OPT": "-9"
}
},
+ "nightly-x86_64-linux-rocky8-validate": {
+ "after_script": [
+ ".gitlab/ci.sh save_cache",
+ ".gitlab/ci.sh clean",
+ "cat ci_timings"
+ ],
+ "allow_failure": false,
+ "artifacts": {
+ "expire_in": "8 weeks",
+ "paths": [
+ "ghc-x86_64-linux-rocky8-validate.tar.xz",
+ "junit.xml"
+ ],
+ "reports": {
+ "junit": "junit.xml"
+ },
+ "when": "always"
+ },
+ "cache": {
+ "key": "x86_64-linux-rocky8-$CACHE_REV",
+ "paths": [
+ "cabal-cache",
+ "toolchain"
+ ]
+ },
+ "dependencies": [],
+ "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-rocky8:$DOCKER_REV",
+ "needs": [
+ {
+ "artifacts": false,
+ "job": "hadrian-ghc-in-ghci"
+ }
+ ],
+ "rules": [
+ {
+ "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+ "when": "on_success"
+ }
+ ],
+ "script": [
+ "sudo chown ghc:ghc -R .",
+ ".gitlab/ci.sh setup",
+ ".gitlab/ci.sh configure",
+ ".gitlab/ci.sh build_hadrian",
+ ".gitlab/ci.sh test_hadrian"
+ ],
+ "stage": "full-build",
+ "tags": [
+ "x86_64-linux"
+ ],
+ "variables": {
+ "BIGNUM_BACKEND": "gmp",
+ "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-validate",
+ "BUILD_FLAVOUR": "validate",
+ "CONFIGURE_ARGS": "",
+ "HADRIAN_ARGS": "--docs=no-sphinx",
+ "TEST_ENV": "x86_64-linux-rocky8-validate",
+ "XZ_OPT": "-9"
+ }
+ },
"nightly-x86_64-linux-ubuntu20_04-validate": {
"after_script": [
".gitlab/ci.sh save_cache",
@@ -2848,6 +2908,67 @@
"XZ_OPT": "-9"
}
},
+ "release-x86_64-linux-rocky8-release": {
+ "after_script": [
+ ".gitlab/ci.sh save_cache",
+ ".gitlab/ci.sh clean",
+ "cat ci_timings"
+ ],
+ "allow_failure": false,
+ "artifacts": {
+ "expire_in": "1 year",
+ "paths": [
+ "ghc-x86_64-linux-rocky8-release.tar.xz",
+ "junit.xml"
+ ],
+ "reports": {
+ "junit": "junit.xml"
+ },
+ "when": "always"
+ },
+ "cache": {
+ "key": "x86_64-linux-rocky8-$CACHE_REV",
+ "paths": [
+ "cabal-cache",
+ "toolchain"
+ ]
+ },
+ "dependencies": [],
+ "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-rocky8:$DOCKER_REV",
+ "needs": [
+ {
+ "artifacts": false,
+ "job": "hadrian-ghc-in-ghci"
+ }
+ ],
+ "rules": [
+ {
+ "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB == \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+ "when": "on_success"
+ }
+ ],
+ "script": [
+ "sudo chown ghc:ghc -R .",
+ ".gitlab/ci.sh setup",
+ ".gitlab/ci.sh configure",
+ ".gitlab/ci.sh build_hadrian",
+ ".gitlab/ci.sh test_hadrian"
+ ],
+ "stage": "full-build",
+ "tags": [
+ "x86_64-linux"
+ ],
+ "variables": {
+ "BIGNUM_BACKEND": "gmp",
+ "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-release",
+ "BUILD_FLAVOUR": "release",
+ "CONFIGURE_ARGS": "",
+ "HADRIAN_ARGS": "--docs=no-sphinx",
+ "IGNORE_PERF_FAILURES": "all",
+ "TEST_ENV": "x86_64-linux-rocky8-release",
+ "XZ_OPT": "-9"
+ }
+ },
"release-x86_64-linux-ubuntu20_04-release": {
"after_script": [
".gitlab/ci.sh save_cache",
@@ -4219,6 +4340,65 @@
"TEST_ENV": "x86_64-linux-fedora33-validate+debug_info"
}
},
+ "x86_64-linux-rocky8-validate": {
+ "after_script": [
+ ".gitlab/ci.sh save_cache",
+ ".gitlab/ci.sh clean",
+ "cat ci_timings"
+ ],
+ "allow_failure": false,
+ "artifacts": {
+ "expire_in": "2 weeks",
+ "paths": [
+ "ghc-x86_64-linux-rocky8-validate.tar.xz",
+ "junit.xml"
+ ],
+ "reports": {
+ "junit": "junit.xml"
+ },
+ "when": "always"
+ },
+ "cache": {
+ "key": "x86_64-linux-rocky8-$CACHE_REV",
+ "paths": [
+ "cabal-cache",
+ "toolchain"
+ ]
+ },
+ "dependencies": [],
+ "image": "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-rocky8:$DOCKER_REV",
+ "needs": [
+ {
+ "artifacts": false,
+ "job": "hadrian-ghc-in-ghci"
+ }
+ ],
+ "rules": [
+ {
+ "if": "($CI_MERGE_REQUEST_LABELS !~ /.*fast-ci.*/) && ($RELEASE_JOB != \"yes\") && ($NIGHTLY == null) && (\"true\" == \"true\") && (\"true\" == \"true\") && (\"true\" == \"true\")",
+ "when": "on_success"
+ }
+ ],
+ "script": [
+ "sudo chown ghc:ghc -R .",
+ ".gitlab/ci.sh setup",
+ ".gitlab/ci.sh configure",
+ ".gitlab/ci.sh build_hadrian",
+ ".gitlab/ci.sh test_hadrian"
+ ],
+ "stage": "full-build",
+ "tags": [
+ "x86_64-linux"
+ ],
+ "variables": {
+ "BIGNUM_BACKEND": "gmp",
+ "BIN_DIST_NAME": "ghc-x86_64-linux-rocky8-validate",
+ "BUILD_FLAVOUR": "validate",
+ "CONFIGURE_ARGS": "",
+ "HADRIAN_ARGS": "--docs=no-sphinx",
+ "TEST_ENV": "x86_64-linux-rocky8-validate"
+ }
+ },
"x86_64-linux-ubuntu20_04-validate": {
"after_script": [
".gitlab/ci.sh save_cache",
=====================================
configure.ac
=====================================
@@ -728,9 +728,6 @@ AC_SUBST(TargetHasIdentDirective)
GHC_GNU_NONEXEC_STACK
AC_SUBST(TargetHasGnuNonexecStack)
-dnl ** figure out how to do context diffs
-FP_PROG_CONTEXT_DIFF
-
dnl Let's make sure install-sh is executable here. If we got it from
dnl a darcs repo, it might not be (see bug #978).
chmod +x install-sh
=====================================
m4/fp_prog_context_diff.m4 deleted
=====================================
@@ -1,23 +0,0 @@
-# FP_PROG_CONTEXT_DIFF
-# --------------------
-# Figure out how to do context diffs. Sets the output variable ContextDiffCmd.
-#
-# Note: NeXTStep thinks diff'ing a file against itself is "trouble".
-AC_DEFUN([FP_PROG_CONTEXT_DIFF],
-[AC_CACHE_CHECK([for a working context diff], [fp_cv_context_diff],
-[echo foo > conftest1
-echo foo > conftest2
-fp_cv_context_diff=no
-for fp_var in '-U 1' '-u1' '-C 1' '-c1'
-do
- if diff $fp_var conftest1 conftest2 > /dev/null 2>&1; then
- fp_cv_context_diff="diff $fp_var"
- break
- fi
-done])
-if test x"$fp_cv_context_diff" = xno; then
- AC_MSG_ERROR([cannot figure out how to do context diffs])
-fi
-AC_SUBST(ContextDiffCmd, [$fp_cv_context_diff])
-])# FP_PROG_CONTEXT_DIFF
-
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/970018848d5db7aae2939bb0a459a794ccf4a085...34563a650cb9962c839c9875bd8cf989cf4dba76
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/970018848d5db7aae2939bb0a459a794ccf4a085...34563a650cb9962c839c9875bd8cf989cf4dba76
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230111/94458ca9/attachment-0001.html>
More information about the ghc-commits
mailing list