Skip to content

Commit fc5dacb

Browse files
committed
Native/wgpu-native: Drop linux-x86 support.
This has never been officially supported by .NET.
1 parent 78a563f commit fc5dacb

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

.github/workflows/wgpu.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,24 @@ jobs:
2222
nuke_invoke: ./build.sh
2323
extras: |
2424
sudo tee /etc/apt/sources.list << EOF
25-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe
26-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
27-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
28-
deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
25+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe
26+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
27+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
28+
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
2929
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy main multiverse restricted universe
3030
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-backports main multiverse restricted universe
3131
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-security main multiverse restricted universe
3232
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-updates main multiverse restricted universe
33-
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe
34-
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
35-
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
36-
deb [arch=amd64,i386] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
33+
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe
34+
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
35+
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
36+
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
3737
EOF
3838
sudo dpkg --add-architecture arm64
3939
sudo dpkg --add-architecture armhf
40-
sudo dpkg --add-architecture i386
4140
sudo apt update
42-
sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-i686-linux-gnu
43-
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
41+
sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
42+
sudo apt install -y libgcc-11-dev libgcc-11-dev-arm64-cross libgcc-11-dev-armhf-cross
4443
- os: windows-2022
4544
name: Windows
4645
nuke_invoke: ./build.cmd
@@ -76,7 +75,6 @@ jobs:
7675
- name: Add targets
7776
if: runner.os == 'Linux'
7877
run: |
79-
rustup target add i686-unknown-linux-gnu
8078
rustup target add aarch64-unknown-linux-gnu
8179
rustup target add arm-unknown-linux-gnueabihf
8280

build/nuke/Native/Wgpu.cs

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ partial class Build {
5858
{
5959
targets = new[]
6060
{
61-
("i686-unknown-linux-gnu", "linux-x86"),
6261
("x86_64-unknown-linux-gnu", "linux-x64"),
6362
("arm-unknown-linux-gnueabihf", "linux-arm"),
6463
("aarch64-unknown-linux-gnu", "linux-arm64"),

src/Native/Silk.NET.WebGPU.Native.WGPU/Silk.NET.WebGPU.Native.WGPU.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<Content Include="runtimes\linux-arm\native\libwgpu_native.so" PackagePath="runtimes\linux-arm\native\libwgpu_native.so" />
2626
<Content Include="runtimes\linux-arm64\native\libwgpu_native.so" PackagePath="runtimes\linux-arm64\native\libwgpu_native.so" />
2727
<Content Include="runtimes\linux-x64\native\libwgpu_native.so" PackagePath="runtimes\linux-x64\native\libwgpu_native.so" />
28-
<Content Include="runtimes\linux-x86\native\libwgpu_native.so" PackagePath="runtimes\linux-x86\native\libwgpu_native.so" />
2928
<Content Include="runtimes\osx-arm64\native\libwgpu_native.dylib" PackagePath="runtimes\osx-arm64\native\libwgpu_native.dylib" />
3029
<Content Include="runtimes\osx-x64\native\libwgpu_native.dylib" PackagePath="runtimes\osx-x64\native\libwgpu_native.dylib" />
3130
<Content Include="runtimes\win-arm64\native\wgpu_native.dll" PackagePath="runtimes\win-arm64\native\wgpu_native.dll" />
Binary file not shown.

0 commit comments

Comments
 (0)