[Git][ghc/ghc][wip/deb10-i386] Use deb10 for i386 bindists
Matthew Pickering (@mpickering)
gitlab at gitlab.haskell.org
Fri Jul 7 11:15:48 UTC 2023
Matthew Pickering pushed to branch wip/deb10-i386 at Glasgow Haskell Compiler / GHC
Commits:
1c1b7d3c by Matthew Pickering at 2023-07-07T12:15:39+01:00
Use deb10 for i386 bindists
deb9 is now EOL so it's time to upgrade the i386 bindist to use deb10
Fixes #23585
- - - - -
5 changed files:
- .gitlab-ci.yml
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- .gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
- .gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
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: 243a00f06550e6b9a00fa0f1530d1bb761e8b7cc
+ DOCKER_REV: 6def896dafef7f622a25aa848ad8f440fb7c4d67
# Sequential version number of all cached things.
# Bump to invalidate GitLab CI cache.
@@ -1048,7 +1048,7 @@ ghcup-metadata-nightly:
artifacts: false
- job: nightly-x86_64-linux-deb9-validate
artifacts: false
- - job: nightly-i386-linux-deb9-validate
+ - job: nightly-i386-linux-deb10-validate
artifacts: false
- job: nightly-x86_64-linux-deb10-validate
artifacts: false
=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -923,7 +923,8 @@ job_groups =
, standardBuilds AArch64 Darwin
, standardBuildsWithConfig AArch64 (Linux Debian10) (splitSectionsBroken vanilla)
, disableValidate (validateBuilds AArch64 (Linux Debian10) llvm)
- , standardBuildsWithConfig I386 (Linux Debian9) (splitSectionsBroken vanilla)
+-- , standardBuildsWithConfig I386 (Linux Debian9) (splitSectionsBroken vanilla)
+ , standardBuildsWithConfig I386 (Linux Debian10) (splitSectionsBroken vanilla)
-- Fully static build, in theory usable on any linux distribution.
, fullyStaticBrokenTests (standardBuildsWithConfig Amd64 (Linux Alpine) (splitSectionsBroken static))
-- Dynamically linked build, suitable for building your own static executables on alpine
=====================================
.gitlab/jobs.yaml
=====================================
@@ -120,7 +120,7 @@
"TEST_ENV": "aarch64-linux-deb10-validate"
}
},
- "i386-linux-deb9-validate": {
+ "i386-linux-deb10-validate": {
"after_script": [
".gitlab/ci.sh save_cache",
".gitlab/ci.sh clean",
@@ -130,7 +130,7 @@
"artifacts": {
"expire_in": "2 weeks",
"paths": [
- "ghc-i386-linux-deb9-validate.tar.xz",
+ "ghc-i386-linux-deb10-validate.tar.xz",
"junit.xml"
],
"reports": {
@@ -139,14 +139,14 @@
"when": "always"
},
"cache": {
- "key": "i386-linux-deb9-$CACHE_REV",
+ "key": "i386-linux-deb10-$CACHE_REV",
"paths": [
"cabal-cache",
"toolchain"
]
},
"dependencies": [],
- "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV",
+ "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb10:$DOCKER_REV",
"needs": [
{
"artifacts": false,
@@ -172,10 +172,10 @@
],
"variables": {
"BIGNUM_BACKEND": "gmp",
- "BIN_DIST_NAME": "ghc-i386-linux-deb9-validate",
+ "BIN_DIST_NAME": "ghc-i386-linux-deb10-validate",
"BUILD_FLAVOUR": "validate",
"CONFIGURE_ARGS": "",
- "TEST_ENV": "i386-linux-deb9-validate"
+ "TEST_ENV": "i386-linux-deb10-validate"
}
},
"nightly-aarch64-darwin-validate": {
@@ -359,7 +359,7 @@
"XZ_OPT": "-9"
}
},
- "nightly-i386-linux-deb9-validate": {
+ "nightly-i386-linux-deb10-validate": {
"after_script": [
".gitlab/ci.sh save_cache",
".gitlab/ci.sh clean",
@@ -369,7 +369,7 @@
"artifacts": {
"expire_in": "8 weeks",
"paths": [
- "ghc-i386-linux-deb9-validate.tar.xz",
+ "ghc-i386-linux-deb10-validate.tar.xz",
"junit.xml"
],
"reports": {
@@ -378,14 +378,14 @@
"when": "always"
},
"cache": {
- "key": "i386-linux-deb9-$CACHE_REV",
+ "key": "i386-linux-deb10-$CACHE_REV",
"paths": [
"cabal-cache",
"toolchain"
]
},
"dependencies": [],
- "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV",
+ "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb10:$DOCKER_REV",
"needs": [
{
"artifacts": false,
@@ -411,10 +411,10 @@
],
"variables": {
"BIGNUM_BACKEND": "gmp",
- "BIN_DIST_NAME": "ghc-i386-linux-deb9-validate",
+ "BIN_DIST_NAME": "ghc-i386-linux-deb10-validate",
"BUILD_FLAVOUR": "validate",
"CONFIGURE_ARGS": "",
- "TEST_ENV": "i386-linux-deb9-validate",
+ "TEST_ENV": "i386-linux-deb10-validate",
"XZ_OPT": "-9"
}
},
@@ -2417,7 +2417,7 @@
"XZ_OPT": "-9"
}
},
- "release-i386-linux-deb9-release+no_split_sections": {
+ "release-i386-linux-deb10-release+no_split_sections": {
"after_script": [
".gitlab/ci.sh save_cache",
".gitlab/ci.sh clean",
@@ -2427,7 +2427,7 @@
"artifacts": {
"expire_in": "1 year",
"paths": [
- "ghc-i386-linux-deb9-release+no_split_sections.tar.xz",
+ "ghc-i386-linux-deb10-release+no_split_sections.tar.xz",
"junit.xml"
],
"reports": {
@@ -2436,14 +2436,14 @@
"when": "always"
},
"cache": {
- "key": "i386-linux-deb9-$CACHE_REV",
+ "key": "i386-linux-deb10-$CACHE_REV",
"paths": [
"cabal-cache",
"toolchain"
]
},
"dependencies": [],
- "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb9:$DOCKER_REV",
+ "image": "registry.gitlab.haskell.org/ghc/ci-images/i386-linux-deb10:$DOCKER_REV",
"needs": [
{
"artifacts": false,
@@ -2469,12 +2469,12 @@
],
"variables": {
"BIGNUM_BACKEND": "gmp",
- "BIN_DIST_NAME": "ghc-i386-linux-deb9-release+no_split_sections",
+ "BIN_DIST_NAME": "ghc-i386-linux-deb10-release+no_split_sections",
"BUILD_FLAVOUR": "release+no_split_sections",
"CONFIGURE_ARGS": "",
"HADRIAN_ARGS": "--hash-unit-ids",
"IGNORE_PERF_FAILURES": "all",
- "TEST_ENV": "i386-linux-deb9-release+no_split_sections",
+ "TEST_ENV": "i386-linux-deb10-release+no_split_sections",
"XZ_OPT": "-9"
}
},
=====================================
.gitlab/rel_eng/fetch-gitlab-artifacts/fetch_gitlab.py
=====================================
@@ -34,6 +34,7 @@ def job_triple(job_name):
'release-x86_64-linux-alpine3_12-int_native-release+fully_static': 'x86_64-alpine3_12-linux-static-int_native',
'release-x86_64-darwin-release': 'x86_64-apple-darwin',
'release-i386-linux-deb9-release': 'i386-deb9-linux',
+ 'release-i386-linux-deb10-release': 'i386-deb10-linux',
'release-armv7-linux-deb10-release': 'armv7-deb10-linux',
'release-aarch64-linux-deb10-release': 'aarch64-deb10-linux',
'release-aarch64-darwin-release': 'aarch64-apple-darwin',
=====================================
.gitlab/rel_eng/mk-ghcup-metadata/mk_ghcup_metadata.py
=====================================
@@ -191,7 +191,7 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map):
deb10 = mk(debian("x86_64", 10))
deb11 = mk(debian("x86_64", 11))
deb10_arm64 = mk(debian("aarch64", 10))
- deb9_i386 = mk(debian("i386", 9))
+ deb10_i386 = mk(debian("i386", 10))
source = mk_one_metadata(release_mode, version, job_map, source_artifact)
test = mk_one_metadata(release_mode, version, job_map, test_artifact)
@@ -221,10 +221,10 @@ def mk_new_yaml(release_mode, version, date, pipeline_type, job_map):
}
- a32 = { "Linux_Debian": { "<10": deb9_i386, "unknown_versioning": deb9_i386 }
- , "Linux_Ubuntu": { "unknown_versioning": deb9_i386 }
- , "Linux_Mint" : { "unknown_versioning": deb9_i386 }
- , "Linux_UnknownLinux" : { "unknown_versioning": deb9_i386 }
+ a32 = { "Linux_Debian": { "unknown_versioning": deb10_i386 }
+ , "Linux_Ubuntu": { "unknown_versioning": deb10_i386 }
+ , "Linux_Mint" : { "unknown_versioning": deb10_i386 }
+ , "Linux_UnknownLinux" : { "unknown_versioning": deb10_i386 }
}
arm64 = { "Linux_UnknownLinux": { "unknown_versioning": deb10_arm64 }
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1c1b7d3cf08da47f205044b1b9c96031c6431813
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1c1b7d3cf08da47f205044b1b9c96031c6431813
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/20230707/4e9e8c33/attachment-0001.html>
More information about the ghc-commits
mailing list