Compare commits

...

5 Commits

Author SHA1 Message Date
Half-Shot
756b4a4585 lint 2024-05-20 09:52:22 +01:00
Half-Shot
8a34c711aa remove target 2024-05-20 09:50:44 +01:00
Half-Shot
84badacfe3 Remove ia32 from target 2024-05-20 09:48:52 +01:00
Half-Shot
7f970b0553 Remove 32 bit Windows mentions from docs. 2024-05-20 09:48:43 +01:00
Half-Shot
01a1d62396 Remove ia32 from workflows. 2024-05-20 09:48:30 +01:00
6 changed files with 7 additions and 40 deletions

View File

@ -59,7 +59,7 @@ jobs:
name: Windows ${{ matrix.arch }} name: Windows ${{ matrix.arch }}
strategy: strategy:
matrix: matrix:
arch: [ia32, x64] arch: [x64]
uses: ./.github/workflows/build_windows.yaml uses: ./.github/workflows/build_windows.yaml
secrets: inherit secrets: inherit
with: with:
@ -110,7 +110,7 @@ jobs:
- name: Prepare artifacts for deployment - name: Prepare artifacts for deployment
run: | run: |
# Windows # Windows
for arch in x64 ia32 arm64 for arch in x64 arm64
do do
if [ -d "win-$arch" ]; then if [ -d "win-$arch" ]; then
mkdir -p packages.element.io/{install,update}/win32/$arch mkdir -p packages.element.io/{install,update}/win32/$arch
@ -143,7 +143,7 @@ jobs:
if: needs.prepare.outputs.nightly-version != '' if: needs.prepare.outputs.nightly-version != ''
run: | run: |
# Windows # Windows
for arch in x64 ia32 arm64 for arch in x64 arm64
do do
[ -d "win-$arch" ] && mv packages.element.io/install/win32/$arch/{*,"Element Nightly Setup"}.exe [ -d "win-$arch" ] && mv packages.element.io/install/win32/$arch/{*,"Element Nightly Setup"}.exe
done done
@ -159,7 +159,7 @@ jobs:
if: needs.prepare.outputs.nightly-version == '' if: needs.prepare.outputs.nightly-version == ''
run: | run: |
# Windows # Windows
for arch in x64 ia32 arm64 for arch in x64 arm64
do do
if [ -d "win-$arch" ]; then if [ -d "win-$arch" ]; then
pushd packages.element.io/install/win32/$arch pushd packages.element.io/install/win32/$arch

View File

@ -19,7 +19,7 @@ jobs:
uses: ./.github/workflows/build_windows.yaml uses: ./.github/workflows/build_windows.yaml
strategy: strategy:
matrix: matrix:
arch: [x64, ia32] arch: [x64]
with: with:
arch: ${{ matrix.arch }} arch: ${{ matrix.arch }}
@ -79,10 +79,6 @@ jobs:
artifact: linux-arm64-sqlcipher-static artifact: linux-arm64-sqlcipher-static
executable: "/opt/Element/element-desktop" executable: "/opt/Element/element-desktop"
prepare_cmd: "sudo apt install -y ./dist/*.deb" 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) - name: Windows (x64)
os: windows-latest os: windows-latest
artifact: win-x64 artifact: win-x64

View File

@ -19,7 +19,7 @@ on:
arch: arch:
type: string type: string
required: true required: true
description: "The architecture to build for, one of 'x64' | 'ia32' | 'arm64'" description: "The architecture to build for, one of 'x64' | 'arm64'"
version: version:
type: string type: string
required: false required: false
@ -49,11 +49,6 @@ jobs:
"target": "aarch64-pc-windows-msvc", "target": "aarch64-pc-windows-msvc",
"build-args": "--arm64", "build-args": "--arm64",
"arch": "amd64_arm64" "arch": "amd64_arm64"
},
"ia32": {
"target": "i686-pc-windows-msvc",
"build-args": "--ia32",
"arch": "x86"
} }
} }

View File

@ -109,13 +109,7 @@ yarn run build:universal
### Windows ### Windows
If you're on Windows, you can choose to build specifically for 32 or 64 bit: If you're on Windows, you can only build for 64 bit:
```
yarn run build:32
```
or
``` ```
yarn run build:64 yarn run build:64

View File

@ -22,17 +22,8 @@ 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`. 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. 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 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.

View File

@ -23,7 +23,6 @@ export type TargetId =
| "aarch64-apple-darwin" | "aarch64-apple-darwin"
| "x86_64-apple-darwin" | "x86_64-apple-darwin"
| "universal-apple-darwin" | "universal-apple-darwin"
| "i686-pc-windows-msvc"
| "x86_64-pc-windows-msvc" | "x86_64-pc-windows-msvc"
| "aarch64-pc-windows-msvc" | "aarch64-pc-windows-msvc"
| "i686-unknown-freebsd" | "i686-unknown-freebsd"
@ -88,13 +87,6 @@ const universalAppleDarwin: UniversalTarget = {
subtargets: [aarch64AppleDarwin, x8664AppleDarwin], subtargets: [aarch64AppleDarwin, x8664AppleDarwin],
}; };
const i686PcWindowsMsvc: WindowsTarget = {
id: "i686-pc-windows-msvc",
platform: "win32",
arch: "ia32",
vcVarsArch: "x86",
};
const x8664PcWindowsMsvc: WindowsTarget = { const x8664PcWindowsMsvc: WindowsTarget = {
id: "x86_64-pc-windows-msvc", id: "x86_64-pc-windows-msvc",
platform: "win32", platform: "win32",
@ -189,7 +181,6 @@ export const TARGETS: Record<TargetId, Target> = {
"x86_64-apple-darwin": x8664AppleDarwin, "x86_64-apple-darwin": x8664AppleDarwin,
"universal-apple-darwin": universalAppleDarwin, "universal-apple-darwin": universalAppleDarwin,
// Windows // Windows
"i686-pc-windows-msvc": i686PcWindowsMsvc,
"x86_64-pc-windows-msvc": x8664PcWindowsMsvc, "x86_64-pc-windows-msvc": x8664PcWindowsMsvc,
"aarch64-pc-windows-msvc": aarch64WindowsMsvc, "aarch64-pc-windows-msvc": aarch64WindowsMsvc,
// FreeBSD // FreeBSD