From 01a1d623965e7ab792189606f7067b7033e9b8ad Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 20 May 2024 09:48:30 +0100 Subject: [PATCH 1/5] Remove ia32 from workflows. --- .github/workflows/build_and_deploy.yaml | 8 ++++---- .github/workflows/build_and_test.yaml | 6 +----- .github/workflows/build_windows.yaml | 7 +------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml index 5fc81f3194..9192a8ccbc 100644 --- a/.github/workflows/build_and_deploy.yaml +++ b/.github/workflows/build_and_deploy.yaml @@ -59,7 +59,7 @@ jobs: name: Windows ${{ matrix.arch }} strategy: matrix: - arch: [ia32, x64] + arch: [x64] uses: ./.github/workflows/build_windows.yaml secrets: inherit with: @@ -110,7 +110,7 @@ jobs: - name: Prepare artifacts for deployment run: | # 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 @@ -143,7 +143,7 @@ jobs: if: needs.prepare.outputs.nightly-version != '' run: | # 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 @@ -159,7 +159,7 @@ jobs: if: needs.prepare.outputs.nightly-version == '' run: | # 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 c940c73c1c..2485299d63 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -19,7 +19,7 @@ jobs: uses: ./.github/workflows/build_windows.yaml strategy: matrix: - arch: [x64, ia32] + arch: [x64] with: arch: ${{ matrix.arch }} @@ -79,10 +79,6 @@ jobs: artifact: linux-arm64-sqlcipher-static executable: "/opt/Element/element-desktop" prepare_cmd: "sudo apt install -y ./dist/*.deb" - - name: Windows (x86) - os: windows-latest - artifact: win-ia32 - executable: "./dist/win-ia32-unpacked/Element.exe" - name: Windows (x64) os: windows-latest artifact: win-x64 diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 7faacaf585..d328ec9721 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -19,7 +19,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 @@ -49,11 +49,6 @@ jobs: "target": "aarch64-pc-windows-msvc", "build-args": "--arm64", "arch": "amd64_arm64" - }, - "ia32": { - "target": "i686-pc-windows-msvc", - "build-args": "--ia32", - "arch": "x86" } } From 7f970b0553f9afda4f920bdc8df8dfd66a1326b2 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 20 May 2024 09:48:43 +0100 Subject: [PATCH 2/5] Remove 32 bit Windows mentions from docs. --- docs/native-node-modules.md | 8 +------- docs/windows-requirements.md | 8 -------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/docs/native-node-modules.md b/docs/native-node-modules.md index 87efc36a35..7a89fc5fed 100644 --- a/docs/native-node-modules.md +++ b/docs/native-node-modules.md @@ -109,13 +109,7 @@ yarn run build:universal ### Windows -If you're on Windows, you can choose to build specifically for 32 or 64 bit: - -``` -yarn run build:32 -``` - -or +If you're on Windows, you can only build for 64 bit: ``` yarn run build:64 diff --git a/docs/windows-requirements.md b/docs/windows-requirements.md index 9f67437934..423eacc797 100644 --- a/docs/windows-requirements.md +++ b/docs/windows-requirements.md @@ -22,17 +22,9 @@ If you want to build native modules, make sure that the following tools are inst Once installed make sure all those utilities are accessible in your `PATH`. -If you want to be able to build x86 targets from an x64 host install the right toolchain: - -```cmd -rustup toolchain install stable-i686-pc-windows-msvc -rustup target add i686-pc-windows-msvc -``` - In order to load all the C++ utilities installed by Visual Studio you can run the following in a terminal window. ``` call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 ``` -You can replace `amd64` with `x86` depending on your CPU architecture. From 84badacfe34da9def4332c5ece512706acf4132b Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 20 May 2024 09:48:52 +0100 Subject: [PATCH 3/5] Remove ia32 from target --- scripts/hak/target.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts index 81a47e7876..b046eebb7b 100644 --- a/scripts/hak/target.ts +++ b/scripts/hak/target.ts @@ -23,7 +23,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" @@ -88,13 +87,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", From 8a34c711aa037935a178ff533224f138f0c05605 Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 20 May 2024 09:50:44 +0100 Subject: [PATCH 4/5] remove target --- scripts/hak/target.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/hak/target.ts b/scripts/hak/target.ts index b046eebb7b..d9f2a6afd0 100644 --- a/scripts/hak/target.ts +++ b/scripts/hak/target.ts @@ -181,7 +181,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 From 756b4a458500af50ac41259907344099bfd6d24f Mon Sep 17 00:00:00 2001 From: Half-Shot Date: Mon, 20 May 2024 09:52:22 +0100 Subject: [PATCH 5/5] lint --- docs/windows-requirements.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/windows-requirements.md b/docs/windows-requirements.md index 423eacc797..41c0cae353 100644 --- a/docs/windows-requirements.md +++ b/docs/windows-requirements.md @@ -27,4 +27,3 @@ In order to load all the C++ utilities installed by Visual Studio you can run th ``` call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64 ``` -