summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml37
-rw-r--r--docs/users_guide/8.12.1-notes.rst5
2 files changed, 5 insertions, 37 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21047966f1..2ea30af32b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -817,15 +817,6 @@ validate-x86_64-windows-hadrian:
cache:
key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION"
-nightly-i386-windows-hadrian:
- <<: *nightly
- extends: .build-windows-hadrian
- variables:
- MSYSTEM: MINGW32
- TEST_ENV: "i386-windows-hadrian"
- cache:
- key: "i386-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION"
-
.build-windows-make:
extends: .build-windows
stage: full-build
@@ -882,34 +873,6 @@ release-x86_64-windows-integer-simple:
BIGNUM_BACKEND: native
BUILD_FLAVOUR: "perf"
-
-.build-i386-windows-make:
- extends: .build-windows-make
- variables:
- MSYSTEM: MINGW32
- # Due to #15934
- BUILD_PROF_LIBS: "NO"
- TEST_ENV: "i386-windows"
- # Due to #17736
- allow_failure: true
- cache:
- key: "i386-windows-$WINDOWS_TOOLCHAIN_VERSION"
-
-validate-i386-windows:
- extends: .build-i386-windows-make
- variables:
- BUILD_FLAVOUR: "perf"
-
-release-i386-windows:
- <<: *release
- extends: .build-i386-windows-make
- variables:
- BUILD_FLAVOUR: "perf"
-
-nightly-i386-windows:
- <<: *nightly
- extends: .build-i386-windows-make
-
############################################################
# Cleanup
############################################################
diff --git a/docs/users_guide/8.12.1-notes.rst b/docs/users_guide/8.12.1-notes.rst
index 1fe2e49894..454d50a12e 100644
--- a/docs/users_guide/8.12.1-notes.rst
+++ b/docs/users_guide/8.12.1-notes.rst
@@ -79,6 +79,11 @@ Highlights
$(return [])
instance C Bool where foo = True
+ * Support for 32-bit Windows has officially been dropped as Microsoft has
+ formally discontinued new 32-bit Windows 10 releases in 2020. See
+ :ghc-ticket:`18487` for details.
+
+
Full details
------------