From c5ff36d94b26a98420dc25e86d471255ce49d7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sat, 13 Apr 2024 23:34:43 +0200 Subject: [PATCH] Native/wgpu-native: Drop linux-x86 support. This has never been officially supported by .NET. --- .github/workflows/wgpu.yml | 22 ++++++++++------------ build/nuke/Native/Wgpu.cs | 1 - 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/wgpu.yml b/.github/workflows/wgpu.yml index f974e39fb1..238376f2d7 100644 --- a/.github/workflows/wgpu.yml +++ b/.github/workflows/wgpu.yml @@ -22,25 +22,24 @@ jobs: nuke_invoke: ./build.sh extras: | sudo tee /etc/apt/sources.list << EOF - deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe - deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe - deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe - deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe + deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe deb [arch=arm64,armhf] http://ports.ubuntu.com jammy main multiverse restricted universe deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-backports main multiverse restricted universe deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-security main multiverse restricted universe deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-updates main multiverse restricted universe - deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe - deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe - deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe - deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe + deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe + deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe + deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe + deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe EOF sudo dpkg --add-architecture arm64 sudo dpkg --add-architecture armhf - sudo dpkg --add-architecture i386 sudo apt update - sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-i686-linux-gnu - sudo apt install -y libgcc-11-dev libgcc-11-dev:i386 libgcc-11-dev-arm64-cross libgcc-11-dev-armhf-cross libgcc-11-dev-i386-cross + sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf + sudo apt install -y libgcc-11-dev libgcc-11-dev-arm64-cross libgcc-11-dev-armhf-cross - os: windows-2022 name: Windows nuke_invoke: ./build.cmd @@ -76,7 +75,6 @@ jobs: - name: Add targets if: runner.os == 'Linux' run: | - rustup target add i686-unknown-linux-gnu rustup target add aarch64-unknown-linux-gnu rustup target add arm-unknown-linux-gnueabihf diff --git a/build/nuke/Native/Wgpu.cs b/build/nuke/Native/Wgpu.cs index 48cc289ca5..649ca5a989 100644 --- a/build/nuke/Native/Wgpu.cs +++ b/build/nuke/Native/Wgpu.cs @@ -58,7 +58,6 @@ partial class Build { { targets = new[] { - ("i686-unknown-linux-gnu", "linux-x86"), ("x86_64-unknown-linux-gnu", "linux-x64"), ("arm-unknown-linux-gnueabihf", "linux-arm"), ("aarch64-unknown-linux-gnu", "linux-arm64"),