From 07a7fda2259817fd6b3a7e1f1901ec571554a7b3 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 2 Sep 2021 02:10:09 +0300 Subject: [PATCH] Merge #15939: gitian: Remove Windows 32 bit build fa193dc8e6f3b96fa2dba2f1c1668f7720fed320 doc: Remove win32 from the release process (MarcoFalke) faf666f8148eeb305a9c4f78459aff2c7268016b Remove Windows 32 bit build (MarcoFalke) Pull request description: The Windows 32 bit build has been removed from https://bitcoincore.org/en/download/, so unless there are complaints, we don't need to build it even ACKs for commit fa193d: fanquake: utACK https://github.com/bitcoin/bitcoin/pull/15939/commits/fa193dc8e6f3b96fa2dba2f1c1668f7720fed320 Tree-SHA512: d6f2976a2e0c407698f720b00ac23ec4056626de4eff8621f4c5581120af0460afd1bdef72329cc0e7d92afca48d94ae5fce6777cb36bfabb60b8034ff08fd88 --- .gitlab-ci.yml | 16 ---------------- .travis.yml | 18 ------------------ .travis/test_04_install.sh | 4 ---- ci/Dockerfile.builder | 3 --- ci/matrix.sh | 5 ----- contrib/devtools/test-security-check.py | 12 ------------ contrib/gitian-build.py | 1 - contrib/gitian-descriptors/gitian-win.yml | 4 +--- depends/README.md | 3 +-- doc/build-generic.md | 1 - doc/release-process.md | 5 +---- 11 files changed, 3 insertions(+), 69 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5db2d239eb..0fc1720021 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,13 +144,6 @@ arm-linux-gnueabihf: variables: HOST: arm-linux-gnueabihf -i686-w64-mingw32: - extends: - - .build-depends-template - - .skip-in-fast-mode-template - variables: - HOST: i686-w64-mingw32 - x86_64-w64-mingw32: extends: - .build-depends-template @@ -203,15 +196,6 @@ arm-linux-build: variables: BUILD_TARGET: arm-linux -win32-build: - extends: - - .build-template - - .skip-in-fast-mode-template - needs: - - i686-w64-mingw32 - variables: - BUILD_TARGET: win32 - win64-build: extends: - .build-template diff --git a/.travis.yml b/.travis.yml index f8ff7051a3..c4017a236a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,9 +86,6 @@ jobs: - <<: *builddepends name: depends-arm-linux env: BUILD_TARGET=arm-linux - - <<: *builddepends - name: depends-win32 - env: BUILD_TARGET=win32 - <<: *builddepends name: depends-win64 env: BUILD_TARGET=win64 @@ -113,9 +110,6 @@ jobs: - <<: *buildsrc name: src-arm-linux env: BUILD_TARGET=arm-linux - - <<: *buildsrc - name: src-win32 - env: BUILD_TARGET=win32 - <<: *buildsrc name: src-win64 env: BUILD_TARGET=win64 @@ -137,9 +131,6 @@ jobs: name: src-mac env: BUILD_TARGET=mac # run tests (no tests for arm-linux and mac) - - <<: *runtests - name: tests-win32 - env: BUILD_TARGET=win32 - <<: *runtests name: tests-win64 env: BUILD_TARGET=win64 @@ -223,15 +214,6 @@ after_success: GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" - - stage: test - name: 'Win32 [GOAL: deploy] [no gui tests]' - env: >- - HOST=i686-w64-mingw32 - DPKG_ADD_ARCH="i386" - PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32" - GOAL="deploy" - BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" - - stage: test name: 'Win64 [GOAL: deploy] [no gui tests]' env: >- diff --git a/.travis/test_04_install.sh b/.travis/test_04_install.sh index a363d5924f..7bcd2439f9 100755 --- a/.travis/test_04_install.sh +++ b/.travis/test_04_install.sh @@ -21,10 +21,6 @@ DOCKER_EXEC () { docker exec $DOCKER_ID bash -c "cd $PWD && $*" } -if [ -n "$DPKG_ADD_ARCH" ]; then - DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" -fi - travis_retry DOCKER_EXEC apt-get update travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES diff --git a/ci/Dockerfile.builder b/ci/Dockerfile.builder index d276006cea..89cf25c8ca 100644 --- a/ci/Dockerfile.builder +++ b/ci/Dockerfile.builder @@ -36,7 +36,6 @@ RUN useradd -u ${USER_ID} -g dash -s /bin/bash -m -d /dash dash RUN dpkg --add-architecture i386 RUN apt-get update && apt-get install $APT_ARGS g++-7-multilib && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install $APT_ARGS g++-arm-linux-gnueabihf && rm -rf /var/lib/apt/lists/* -RUN apt-get update && apt-get install $APT_ARGS g++-mingw-w64-i686 && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install $APT_ARGS g++-mingw-w64-x86-64 && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install $APT_ARGS wine-stable wine32 wine64 bc nsis && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install $APT_ARGS python3-zmq && rm -rf /var/lib/apt/lists/* @@ -51,8 +50,6 @@ RUN ln -s x86_64-linux-gnu/asm /usr/include/asm # Make sure std::thread and friends is available RUN \ - update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix; \ - update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix; \ update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix; \ update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; \ exit 0 diff --git a/ci/matrix.sh b/ci/matrix.sh index c23b6943cc..22c200545c 100755 --- a/ci/matrix.sh +++ b/ci/matrix.sh @@ -43,11 +43,6 @@ if [ "$BUILD_TARGET" = "arm-linux" ]; then export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --enable-werror CXXFLAGS=-Wno-psabi" export RUN_UNITTESTS=false export RUN_INTEGRATIONTESTS=false -elif [ "$BUILD_TARGET" = "win32" ]; then - export HOST=i686-w64-mingw32 - export DPKG_ADD_ARCH="i386" - export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --disable-miner" - export DIRECT_WINE_EXEC_TESTS=true elif [ "$BUILD_TARGET" = "win64" ]; then export HOST=x86_64-w64-mingw32 export DPKG_ADD_ARCH="i386" diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py index bb1910415e..f5bff2ec0c 100755 --- a/contrib/devtools/test-security-check.py +++ b/contrib/devtools/test-security-check.py @@ -43,18 +43,6 @@ class TestSecurityChecks(unittest.TestCase): self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-fstack-protector-all','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE']), (0, '')) - def test_32bit_PE(self): - source = 'test1.c' - executable = 'test1.exe' - cc = 'i686-w64-mingw32-gcc' - write_testcode(source) - - self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--no-nxcompat','-Wl,--no-dynamicbase']), - (1, executable+': failed DYNAMIC_BASE NX')) - self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--no-dynamicbase']), - (1, executable+': failed DYNAMIC_BASE')) - self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--dynamicbase']), - (0, '')) def test_64bit_PE(self): source = 'test1.c' executable = 'test1.exe' diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index ec07114417..d1736e9be0 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -98,7 +98,6 @@ def sign(): subprocess.check_call(['bin/gbuild', '--skip-image', '--upgrade', '--commit', 'signature='+args.commit, '../dash/contrib/gitian-descriptors/gitian-win-signer.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-win-signed', '--destination', '../gitian.sigs/', '../dash/contrib/gitian-descriptors/gitian-win-signer.yml']) subprocess.check_call('mv build/out/dashcore-*win64-setup.exe ../dashcore-binaries/'+args.version, shell=True) - subprocess.check_call('mv build/out/dashcore-*win32-setup.exe ../dashcore-binaries/'+args.version, shell=True) if args.macos: print('\nSigning ' + args.version + ' MacOS') diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index d264c49171..f344dbe88a 100755 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -31,7 +31,7 @@ script: | set -e -o pipefail WRAP_DIR=$HOME/wrapped - HOSTS="i686-w64-mingw32 x86_64-w64-mingw32" + HOSTS="x86_64-w64-mingw32" CONFIGFLAGS="--enable-reduce-exports --disable-miner --disable-bench --disable-gui-tests --enable-crash-hooks" FAKETIME_HOST_PROGS="ar ranlib nm windres strip objcopy" FAKETIME_PROGS="date makensis zip" @@ -209,9 +209,7 @@ script: | cp $OUTDIR/dashcore-*setup-unsigned.exe unsigned/ find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip - mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip - mv ${OUTDIR}/${DISTNAME}-i686-*.zip ${OUTDIR}/${DISTNAME}-win32.zip # Compress ccache (otherwise the assert file will get too huge) if [ "$CCACHE_DIR" != "" ]; then diff --git a/depends/README.md b/depends/README.md index 5f958f3c74..b2c61b5787 100644 --- a/depends/README.md +++ b/depends/README.md @@ -20,7 +20,6 @@ created. To use it for Dash: Common `host-platform-triplets` for cross compilation are: -- `i686-w64-mingw32` for Win32 - `x86_64-w64-mingw32` for Win64 - `x86_64-apple-darwin16` for macOS - `arm-linux-gnueabihf` for Linux ARM 32 bit @@ -37,7 +36,7 @@ For macOS cross compilation: sudo apt-get install curl librsvg2-bin libtiff-tools bsdmainutils imagemagick libcap-dev libz-dev libbz2-dev python3-setuptools -For Win32/Win64 cross compilation: +For Win64 cross compilation: - see [build-windows.md](../doc/build-windows.md#cross-compilation-for-ubuntu-and-windows-subsystem-for-linux) diff --git a/doc/build-generic.md b/doc/build-generic.md index deb83ebd1a..2e6a543d45 100644 --- a/doc/build-generic.md +++ b/doc/build-generic.md @@ -47,7 +47,6 @@ $ make install # optional Please replace `` with your local system's `host-platform-triplet`. The following triplets are usually valid: - `i686-pc-linux-gnu` for Linux32 - `x86_64-pc-linux-gnu` for Linux64 -- `i686-w64-mingw32` for Win32 - `x86_64-w64-mingw32` for Win64 - `x86_64-apple-darwin16` for MacOSX - `arm-linux-gnueabihf` for Linux ARM 32 bit diff --git a/doc/release-process.md b/doc/release-process.md index f1e3e480fa..a2a05e44a0 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -213,7 +213,6 @@ Create (and optionally verify) the signed Windows binaries: ./bin/gsign --signer "$SIGNER" --release ${VERSION}-win-signed --destination ../gitian.sigs/ ../dash/contrib/gitian-descriptors/gitian-win-signer.yml ./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-signed ../dash/contrib/gitian-descriptors/gitian-win-signer.yml mv build/out/dash-*win64-setup.exe ../dash-${VERSION}-win64-setup.exe - mv build/out/dash-*win32-setup.exe ../dash-${VERSION}-win32-setup.exe popd Commit your signature for the signed macOS/Windows binaries: @@ -221,7 +220,7 @@ Commit your signature for the signed macOS/Windows binaries: pushd gitian.sigs git add ${VERSION}-osx-signed/"${SIGNER}" git add ${VERSION}-win-signed/"${SIGNER}" - git commit -a + git commit -m "Add ${SIGNER} ${VERSION} signed binaries signatures" git push # Assuming you can push to the gitian.sigs tree popd @@ -242,8 +241,6 @@ dash-${VERSION}-x86_64-linux-gnu.tar.gz dash-${VERSION}-osx64.tar.gz dash-${VERSION}-osx.dmg dash-${VERSION}.tar.gz -dash-${VERSION}-win32-setup.exe -dash-${VERSION}-win32.zip dash-${VERSION}-win64-setup.exe dash-${VERSION}-win64.zip ```