CI: give up on musl targets

ahihi · Aug 2, 2024 · f670345 · f670345
1 parent 30d0edd
commit f670345
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 51 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,9 +18,7 @@ jobs:
       matrix:
         target:
           - x86_64-unknown-linux-gnu
-          - x86_64-unknown-linux-musl
           - aarch64-unknown-linux-gnu
-          - aarch64-unknown-linux-musl
           - x86_64-pc-windows-msvc
           - i686-pc-windows-msvc
           - x86_64-apple-darwin
@@ -30,15 +28,9 @@ jobs:
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
             target-apt-arch: amd64
-          - target: x86_64-unknown-linux-musl
-            os: ubuntu-latest
-            target-apt-arch: amd64
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-latest
             target-apt-arch: arm64
-          - target: aarch64-unknown-linux-musl
-            os: ubuntu-latest
-            target-apt-arch: arm64
           - target: x86_64-pc-windows-msvc
             os: windows-latest
           - target: i686-pc-windows-msvc
@@ -59,33 +51,6 @@ jobs:
       - name: checkout
         uses: actions/checkout@v4
 
-      # - name: set up Ubuntu multiarch
-      #   if: startsWith(matrix.os, 'ubuntu') && matrix.target-apt-arch != 'amd64'
-      #   run: |
-      #     readonly DISTRO_CODENAME=$(lsb_release -c | sed -E 's/Codename:\s*//')
-      #     echo "DISTRO_CODENAME=$DISTRO_CODENAME"
-      #     sudo dpkg --add-architecture "${{ matrix.target-apt-arch }}"
-      #     sudo sed -i "s/^deb http/deb [arch=$(dpkg-architecture -q DEB_HOST_ARCH)] http/" /etc/apt/sources.list
-      #     sudo sed -i "s/^deb mirror/deb [arch=$(dpkg-architecture -q DEB_HOST_ARCH)] mirror/" /etc/apt/sources.list
-      #     for suite in '' '-updates' '-backports' '-security'; do
-      #       echo "deb [arch=${{ matrix.target-apt-arch }}] http://ports.ubuntu.com/ $DISTRO_CODENAME$suite main universe multiverse" | \
-      #       sudo tee -a /etc/apt/sources.list >/dev/null
-      #     done
-
-      # - name: cache QEMU and AArch64 cross compiler
-      #   if: startsWith(matrix.target, 'aarch64-unknown-linux')
-      #   uses: awalsh128/cache-apt-pkgs-action@latest
-      #   with:
-      #     packages: qemu-user gcc-aarch64-linux-gnu libc6:arm64
-      #     version: 1.0
-
-      # - name: cache musl development files
-      #   if: endsWith(matrix.target, '-musl')
-      #   uses: awalsh128/cache-apt-pkgs-action@latest
-      #   with:
-      #     packages: musl-tools musl-dev:${{ matrix.target-apt-arch }}
-      #     version: 1.0
-
       - name: cache apt packages
         if: startsWith(matrix.os, 'ubuntu')
         uses: awalsh128/cache-apt-pkgs-action@latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,9 +23,7 @@ jobs:
       matrix:
         target:
           - x86_64-unknown-linux-gnu
-          - x86_64-unknown-linux-musl
           - aarch64-unknown-linux-gnu
-          - aarch64-unknown-linux-musl
           - x86_64-pc-windows-msvc
           - i686-pc-windows-msvc
           - x86_64-apple-darwin

diff --git a/Cross.toml b/Cross.toml
@@ -1,5 +1,6 @@
 [target.x86_64-unknown-linux-gnu]
 pre-build = [
+    "export PKG_CONFIG_LIBDIR_x86_64_unknown_linux_gnu=/usr/lib/x86_64-linux-gnu/pkgconfig",
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get install --assume-yes libasound2-dev:$CROSS_DEB_ARCH"
 ]
@@ -10,17 +11,3 @@ pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get install --assume-yes libasound2-dev:$CROSS_DEB_ARCH"
 ]
-
-[target.x86_64-unknown-linux-musl]
-pre-build = [
-    "find / -name alsa.pc 2> /dev/null || true",
-    "export PKG_CONFIG_LIBDIR_x86_64_unknown_linux_musl=/usr/lib/x86_64-linux-musl/pkgconfig",
-    "apk add alsa-lib-dev"
-]
-
-[target.aarch64-unknown-linux-musl]
-pre-build = [
-    "find / -name alsa.pc 2> /dev/null || true",
-    "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_musl=/usr/lib/aarch64-linux-musl/pkgconfig",
-    "apk add alsa-lib-dev"
-]