From ca564f40f2c6bd0e6cc82614e12a4dbd166b0ead Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com>
Date: Wed, 31 May 2023 13:18:58 +0530
Subject: [PATCH] ci: drop i686 from GitLab CI runs

---
 .gitlab-ci.yml                      | 43 -----------------------------
 .travis.yml                         | 14 ----------
 ci/dash/matrix.sh                   |  4 ---
 ci/test/00_setup_env_i686_centos.sh | 16 -----------
 ci/test/00_setup_env_i686_ubsan.sh  | 15 ----------
 5 files changed, 92 deletions(-)
 delete mode 100644 ci/test/00_setup_env_i686_centos.sh
 delete mode 100755 ci/test/00_setup_env_i686_ubsan.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b78a3ef040..dabbf0385d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,13 +173,6 @@ x86_64-w64-mingw32:
   variables:
     HOST: x86_64-w64-mingw32
 
-i686-pc-linux-gnu:
-  extends:
-    - .build-depends-template
-    - .skip-in-fast-mode-template
-  variables:
-    HOST: i686-pc-linux-gnu
-
 x86_64-pc-linux-gnu-debug:
   extends: .build-depends-template
   variables:
@@ -219,24 +212,6 @@ win64-build:
   variables:
     BUILD_TARGET: win64
 
-linux32-build:
-  extends:
-    - .build-template
-    - .skip-in-fast-mode-template
-  needs:
-    - i686-pc-linux-gnu
-  variables:
-    BUILD_TARGET: linux32
-
-linux32_ubsan-build:
-  extends:
-    - .build-template
-    - .skip-in-fast-mode-template
-  needs:
-    - i686-pc-linux-gnu
-  variables:
-    BUILD_TARGET: linux32_ubsan
-
 linux64-build:
   extends: .build-template
   needs:
@@ -300,24 +275,6 @@ mac-build:
 
 ###
 
-linux32-test:
-  extends:
-    - .test-template
-    - .skip-in-fast-mode-template
-  needs:
-    - linux32-build
-  variables:
-    BUILD_TARGET: linux32
-
-linux32_ubsan-test:
-  extends:
-    - .test-template
-    - .skip-in-fast-mode-template
-  needs:
-    - linux32_ubsan-build
-  variables:
-    BUILD_TARGET: linux32_ubsan
-
 linux64-test:
   extends: .test-template
   needs:
diff --git a/.travis.yml b/.travis.yml
index 26bb191603..309b9cdbb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,9 +97,6 @@ jobs:
     - <<: *builddepends
       name: depends-win64
       env: BUILD_TARGET=win64
-    - <<: *builddepends
-      name: depends-linux32
-      env: BUILD_TARGET=linux32
     - <<: *builddepends
       name: depends-linux64
       env: BUILD_TARGET=linux64
@@ -121,9 +118,6 @@ jobs:
     - <<: *buildsrc
       name: src-win64
       env: BUILD_TARGET=win64
-    - <<: *buildsrc
-      name: src-linux32
-      env: BUILD_TARGET=linux32
     - <<: *buildsrc
       name: src-linux64
       env: BUILD_TARGET=linux64
@@ -142,9 +136,6 @@ jobs:
     - <<: *runtests
       name: tests-win64
       env: BUILD_TARGET=win64
-    - <<: *runtests
-      name: tests-linux32
-      env: BUILD_TARGET=linux32
     - <<: *runtests
       name: tests-linux64
       env: BUILD_TARGET=linux64
@@ -233,11 +224,6 @@ after_success:
       env: >-
         FILE_ENV="./ci/test/00_setup_env_win64.sh"
 
-    - stage: test
-      name: '32-bit + dash  [GOAL: install]  [CentOS 7]  [GUI]'
-      env: >-
-        FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
-
     - stage: test
       name: 'x86_64 Linux  [GOAL: install]  [focal]  [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout] [unsigned char]'
       env: >-
diff --git a/ci/dash/matrix.sh b/ci/dash/matrix.sh
index 61b2559fe3..e6abf281e4 100755
--- a/ci/dash/matrix.sh
+++ b/ci/dash/matrix.sh
@@ -18,10 +18,6 @@ if [ "$BUILD_TARGET" = "arm-linux" ]; then
   source ./ci/test/00_setup_env_arm.sh
 elif [ "$BUILD_TARGET" = "win64" ]; then
   source ./ci/test/00_setup_env_win64.sh
-elif [ "$BUILD_TARGET" = "linux32" ]; then
-  source ./ci/test/00_setup_env_i686_centos.sh
-elif [ "$BUILD_TARGET" = "linux32_ubsan" ]; then
-  source ./ci/test/00_setup_env_i686_ubsan.sh
 elif [ "$BUILD_TARGET" = "linux64" ]; then
   source ./ci/test/00_setup_env_native_qt5.sh
 elif [ "$BUILD_TARGET" = "linux64_tsan" ]; then
diff --git a/ci/test/00_setup_env_i686_centos.sh b/ci/test/00_setup_env_i686_centos.sh
deleted file mode 100644
index 25e116d641..0000000000
--- a/ci/test/00_setup_env_i686_centos.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-export LC_ALL=C.UTF-8
-
-export HOST=i686-pc-linux-gnu
-export CONTAINER_NAME=ci_i686_centos_7
-export DOCKER_NAME_TAG=centos:7
-export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python36-zmq which patch lbzip2 dash"
-export GOAL="install"
-export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-zmq --enable-reduce-exports --enable-crash-hooks --with-sanitizers=undefined"
-export CONFIG_SHELL="/bin/dash"
-export PYZMQ=true
diff --git a/ci/test/00_setup_env_i686_ubsan.sh b/ci/test/00_setup_env_i686_ubsan.sh
deleted file mode 100755
index 9ee40d93c8..0000000000
--- a/ci/test/00_setup_env_i686_ubsan.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2019 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-export LC_ALL=C.UTF-8
-
-export HOST=i686-pc-linux-gnu
-export PACKAGES="g++-multilib python3-zmq"
-export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --disable-bip70 --enable-reduce-exports --enable-crash-hooks --with-sanitizers=undefined"
-export CONFIG_SHELL="/bin/dash"
-export PYZMQ=true
-export RUN_SYMBOL_TESTS=false