Update build.yml

dart-musl · Nov 13, 2024 · bea2258 · bea2258
1 parent 01e1cfb
commit bea2258
Showing 1 changed file with 5 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,16 +56,6 @@ jobs:
           cd dart-sdk/sdk
           ./tools/sdks/dart-sdk/bin/dart run /tmp/version.dart | tee -a $GITHUB_OUTPUT
 
-      - name: Patch
-        run: |
-          cd dart-sdk/sdk
-          if grep -q cxx_version_17 third_party/binaryen/BUILD.gn; then
-            exit 0
-          fi
-          xargs -n 1 -- sh -xc 'curl -fsSL "https://github.com/dart-lang/sdk/commit/$1.diff" | git apply -' -- <<'EOF'
-            4928d75fb9fcdd57d6d22baab96d9f0a2daee12b
-          EOF
-
       - name: Fetch Checked-in Dart SDK
         run: |
           if curl -fsSLO ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ steps.version.outputs.version }}/dartsdk-linux-${{ matrix.host-arch }}-release.tar.gz; then
@@ -147,25 +137,16 @@ jobs:
         run: |
           apk upgrade --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main -- lld 
 
-      - name: Setup multiarch
-        run: |
-          cd "$(mktemp -d)"
-          case ${{ matrix.host-arch }} in
-            arm64)
-              apk add --root . --repositories-file /etc/apk/repositories --allow-untrusted --arch armv7 --no-cache --no-scripts --initdb -- musl
-            ;;
-            x64)
-              apk add --root . --repositories-file /etc/apk/repositories --allow-untrusted --arch x86 --no-cache --no-scripts --initdb -- musl
-            ;;
-          esac
-          find lib -mindepth 1 -maxdepth 1 -name '*.so.*' -print0 | xargs -0 -n 1 -- sh -xc 'cp -u "$1" /lib' --
-          rm -rf "$(pwd)"
-
       - name: Install sysroots
         run: |
           cd dart-sdk/sdk
           ./build/linux/alpine_sysroot_scripts/install-sysroot.sh
 
+      - name: Setup multiarch
+        run: |
+          cd dart-sdk/sdk
+          find buildtools/sysroot -mindepth 1 -maxdepth 1 -name 'alpine-linux-*' -print0 | xargs -0 -n 1 -I {} -- find {}/lib -mindepth 1 -maxdepth 1 \( -name 'ld-musl-*.so.1' -o -name 'libc.musl-*.so.1' \) -print0 | xargs -0 -n 1 -- sh -xc 'cp -u "$1" /lib' --
+
       - name: Build
         run: |
           cd dart-sdk/sdk