From 6be83576eb79dc1a3e68a1183b68a6fe891ed9d1 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Thu, 27 Mar 2025 16:42:02 +0000 Subject: [PATCH] Stop building ia32 Windows. --- .github/workflows/build_and_deploy.yaml | 8 ++++---- .github/workflows/build_and_test.yaml | 6 +----- .github/workflows/build_prepare.yaml | 1 - .github/workflows/build_windows.yaml | 8 +------- scripts/hak/target.ts | 9 --------- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index e159907d..b91f644b 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -62,7 +62,7 @@ jobs: name: Windows ${{ matrix.arch }} strategy: matrix: - arch: [ia32, x64, arm64] + arch: [x64, arm64] uses: ./.github/workflows/build_windows.yaml secrets: inherit with: @@ -114,7 +114,7 @@ jobs: set -x # Windows - for arch in x64 ia32 arm64 + for arch in x64 arm64 do if [ -d "win-$arch" ]; then mkdir -p packages.element.io/{install,update}/win32/$arch @@ -149,7 +149,7 @@ jobs: set -x # Windows - for arch in x64 ia32 arm64 + for arch in x64 arm64 do [ -d "win-$arch" ] && mv packages.element.io/install/win32/$arch/{*,"Element Nightly Setup"}.exe done @@ -167,7 +167,7 @@ jobs: set -x # Windows - for arch in x64 ia32 arm64 + for arch in x64 arm64 do if [ -d "win-$arch" ]; then pushd packages.element.io/install/win32/$arch diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 6569bb45..52f0671c 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -22,7 +22,7 @@ jobs: uses: ./.github/workflows/build_windows.yaml strategy: matrix: - arch: [x64, ia32, arm64] + arch: [x64, arm64] with: arch: ${{ matrix.arch }} @@ -82,10 +82,6 @@ jobs: artifact: linux-arm64-sqlcipher-static executable: "/opt/Element/element-desktop" prepare_cmd: "sudo apt-get -qq update && sudo apt install -y ./dist/*.deb" - - name: Windows (x86) - os: windows-2022 - artifact: win-ia32 - executable: "./dist/win-ia32-unpacked/Element.exe" - name: Windows (x64) os: windows-2022 artifact: win-x64 diff --git a/.github/workflows/build_prepare.yaml b/.github/workflows/build_prepare.yaml index bbad6f04..390d241a 100644 --- a/.github/workflows/build_prepare.yaml +++ b/.github/workflows/build_prepare.yaml @@ -80,7 +80,6 @@ jobs: aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-amd64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p' >> VERSIONS aws s3 cp s3://$R2_BUCKET/debian/dists/default/main/binary-arm64/Packages - --endpoint-url $R2_URL --region auto | grep "Package: element-nightly" -A 50 | grep Version -m1 | sed -n 's/Version: //p' >> VERSIONS aws s3 cp s3://$R2_BUCKET/nightly/update/win32/x64/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8- >> VERSIONS - aws s3 cp s3://$R2_BUCKET/nightly/update/win32/ia32/RELEASES - --endpoint-url $R2_URL --region auto | awk '{print $2}' | cut -d "-" -f 5 | cut -c 8- >> VERSIONS # Pick the greatest one VERSION=$(cat VERSIONS | sort -uf | tail -n1) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index be95f9b7..0627f76c 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -21,7 +21,7 @@ on: arch: type: string required: true - description: "The architecture to build for, one of 'x64' | 'ia32' | 'arm64'" + description: "The architecture to build for, one of 'x64' | 'arm64'" version: type: string required: false @@ -52,12 +52,6 @@ jobs: "target": "aarch64-pc-windows-msvc", "build-args": "--arm64", "arch": "amd64_arm64" - }, - "ia32": { - "target": "i686-pc-windows-msvc", - "build-args": "--ia32", - "arch": "x86", - "extra_config": "{\"user_notice\": {\"title\": \"Your desktop support ends soon\",\"description\": \"Support for 32-bit Windows installations will end soon, this impacts you. Transition to the web or mobile app for continued access.\"}}" } } diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts index 3323e0f5..8b275329 100644 --- a/scripts/hak/target.ts +++ b/scripts/hak/target.ts @@ -15,7 +15,6 @@ export type TargetId = | "aarch64-apple-darwin" | "x86_64-apple-darwin" | "universal-apple-darwin" - | "i686-pc-windows-msvc" | "x86_64-pc-windows-msvc" | "aarch64-pc-windows-msvc" | "i686-unknown-freebsd" @@ -80,13 +79,6 @@ const universalAppleDarwin: UniversalTarget = { subtargets: [aarch64AppleDarwin, x8664AppleDarwin], }; -const i686PcWindowsMsvc: WindowsTarget = { - id: "i686-pc-windows-msvc", - platform: "win32", - arch: "ia32", - vcVarsArch: "x86", -}; - const x8664PcWindowsMsvc: WindowsTarget = { id: "x86_64-pc-windows-msvc", platform: "win32", @@ -181,7 +173,6 @@ export const TARGETS: Record = { "x86_64-apple-darwin": x8664AppleDarwin, "universal-apple-darwin": universalAppleDarwin, // Windows - "i686-pc-windows-msvc": i686PcWindowsMsvc, "x86_64-pc-windows-msvc": x8664PcWindowsMsvc, "aarch64-pc-windows-msvc": aarch64WindowsMsvc, // FreeBSD