mirror of
https://github.com/element-hq/element-desktop
synced 2025-04-01 20:03:43 +02:00
Stop building ia32 Windows.
This commit is contained in:
parent
443be796ee
commit
6be83576eb
8
.github/workflows/build_and_deploy.yaml
vendored
8
.github/workflows/build_and_deploy.yaml
vendored
@ -62,7 +62,7 @@ jobs:
|
|||||||
name: Windows ${{ matrix.arch }}
|
name: Windows ${{ matrix.arch }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [ia32, x64, arm64]
|
arch: [x64, arm64]
|
||||||
uses: ./.github/workflows/build_windows.yaml
|
uses: ./.github/workflows/build_windows.yaml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
with:
|
with:
|
||||||
@ -114,7 +114,7 @@ jobs:
|
|||||||
set -x
|
set -x
|
||||||
|
|
||||||
# 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
|
||||||
@ -149,7 +149,7 @@ jobs:
|
|||||||
set -x
|
set -x
|
||||||
|
|
||||||
# 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
|
||||||
@ -167,7 +167,7 @@ jobs:
|
|||||||
set -x
|
set -x
|
||||||
|
|
||||||
# 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
|
||||||
|
6
.github/workflows/build_and_test.yaml
vendored
6
.github/workflows/build_and_test.yaml
vendored
@ -22,7 +22,7 @@ jobs:
|
|||||||
uses: ./.github/workflows/build_windows.yaml
|
uses: ./.github/workflows/build_windows.yaml
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x64, ia32, arm64]
|
arch: [x64, arm64]
|
||||||
with:
|
with:
|
||||||
arch: ${{ matrix.arch }}
|
arch: ${{ matrix.arch }}
|
||||||
|
|
||||||
@ -82,10 +82,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-get -qq update && sudo apt install -y ./dist/*.deb"
|
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)
|
- name: Windows (x64)
|
||||||
os: windows-2022
|
os: windows-2022
|
||||||
artifact: win-x64
|
artifact: win-x64
|
||||||
|
1
.github/workflows/build_prepare.yaml
vendored
1
.github/workflows/build_prepare.yaml
vendored
@ -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-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/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/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
|
# Pick the greatest one
|
||||||
VERSION=$(cat VERSIONS | sort -uf | tail -n1)
|
VERSION=$(cat VERSIONS | sort -uf | tail -n1)
|
||||||
|
8
.github/workflows/build_windows.yaml
vendored
8
.github/workflows/build_windows.yaml
vendored
@ -21,7 +21,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
|
||||||
@ -52,12 +52,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",
|
|
||||||
"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.\"}}"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,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"
|
||||||
@ -80,13 +79,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",
|
||||||
@ -181,7 +173,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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user