From 92085e1aab3129659fb92ad11be568e75e4b90f2 Mon Sep 17 00:00:00 2001
From: simonsan <14062932+simonsan@users.noreply.github.com>
Date: Fri, 29 Nov 2024 18:02:55 +0100
Subject: [PATCH] chore: remove i686-unknown-linux-gnu,
 armv7-unknown-linux-gnueabihf, and x86_64-unknown-netbsd targets from CI
 workflows and update target list

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>
---
 .github/workflows/cross-ci.yml    | 25 ++++++++++---------------
 .github/workflows/nightly.yml     | 14 +++-----------
 .github/workflows/prebuilt-pr.yml | 14 +++-----------
 dist-workspace.toml               |  2 +-
 4 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml
index ab3596a..9d3c147 100644
--- a/.github/workflows/cross-ci.yml
+++ b/.github/workflows/cross-ci.yml
@@ -71,21 +71,16 @@ jobs:
             target: aarch64-unknown-linux-musl
             architecture: arm64
             use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: i686-unknown-linux-gnu
-            architecture: i686
-            use-cross: true
-          - os: ubuntu-latest
-            os-name: netbsd
-            target: x86_64-unknown-netbsd
-            architecture: x86_64
-            use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: armv7-unknown-linux-gnueabihf
-            architecture: armv7
-            use-cross: true
+          # - os: ubuntu-latest
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
+          #   use-cross: true
+          # - os: ubuntu-latest
+          #   os-name: linux
+          #   target: armv7-unknown-linux-gnueabihf
+          #   architecture: armv7
+          #   use-cross: true
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 241657a..6472df4 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -68,20 +68,12 @@ jobs:
             architecture: arm64
             binary-postfix: ""
             use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: i686-unknown-linux-gnu
-            architecture: i686
-            binary-postfix: ""
-            use-cross: true
-          # FIXME: Doesn't build, due to cannot find -lexecinfo
           # - os: ubuntu-latest
-          #   os-name: netbsd
-          #   target: x86_64-unknown-netbsd
-          #   architecture: x86_64
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
           #   binary-postfix: ""
           #   use-cross: true
-          # FIXME: Doesn't cross-compile, due to `aws-ls-sys` dependency
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf
diff --git a/.github/workflows/prebuilt-pr.yml b/.github/workflows/prebuilt-pr.yml
index ce3aa14..4bb017e 100644
--- a/.github/workflows/prebuilt-pr.yml
+++ b/.github/workflows/prebuilt-pr.yml
@@ -69,20 +69,12 @@ jobs:
             architecture: arm64
             binary-postfix: ""
             use-cross: true
-          - os: ubuntu-latest
-            os-name: linux
-            target: i686-unknown-linux-gnu
-            architecture: i686
-            binary-postfix: ""
-            use-cross: true
-          # FIXME: Doesn't build, due to cannot find -lexecinfo
           # - os: ubuntu-latest
-          #   os-name: netbsd
-          #   target: x86_64-unknown-netbsd
-          #   architecture: x86_64
+          #   os-name: linux
+          #   target: i686-unknown-linux-gnu
+          #   architecture: i686
           #   binary-postfix: ""
           #   use-cross: true
-          # FIXME: Doesn't cross-compile, due to `aws-ls-sys` dependency
           # - os: ubuntu-latest
           #   os-name: linux
           #   target: armv7-unknown-linux-gnueabihf
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 566f00a..c8f70f1 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -12,7 +12,7 @@ ci = "github"
 # The installers to generate for each app
 installers = ["shell", "powershell", "homebrew", "msi"]
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc", "i686-unknown-linux-gnu"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program