From 786dd63ea1ba7f9bdfe1797c9741f3b6c99c8887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AA=E3=81=A4=E3=81=8D?= <i@ntk.me>
Date: Tue, 20 Feb 2024 14:35:13 -0800
Subject: [PATCH] Fix linux musl builds (#2175)

Co-authored-by: Natalie Weizenbaum <nweiz@google.com>
---
 .github/workflows/build-linux-musl.yml |  4 +---
 CHANGELOG.md                           | 11 +++++++++++
 pkg/sass_api/CHANGELOG.md              |  4 ++++
 pkg/sass_api/pubspec.yaml              |  4 ++--
 pubspec.yaml                           |  2 +-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-linux-musl.yml b/.github/workflows/build-linux-musl.yml
index 5f92b71a2..06673f06a 100644
--- a/.github/workflows/build-linux-musl.yml
+++ b/.github/workflows/build-linux-musl.yml
@@ -54,9 +54,7 @@ jobs:
                      ghcr.io/dart-musl/dart <<'EOF'
           set -e
           dart pub get
-          dart run grinder pkg-standalone-linux-${{ matrix.arch }}
-          # Rename the artifact from -linux- to -linux-musl- to avoid conflict with glibc builds.
-          find build -name '*.tar.gz' -print0 | xargs -0 -n 1 -- sh -xc 'mv "$1" "$(echo "$1" | sed -e "s/linux/linux-musl/")"' --
+          dart run grinder pkg-standalone-linux-${{ matrix.arch }}-musl
           EOF
 
       - name: Upload Artifact
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb67ee905..4f2090551 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.71.1
+
+### Command-Line Interface
+
+* Ship the musl Linux release with the proper Dart executable.
+
+### Embedded Sass
+
+* In the JS Embedded Host, properly install the musl Linux embedded compiler
+  when running on musl Linux.
+
 ## 1.71.0
 
 For more information about `pkg:` importers, see [the
diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md
index a0a629ba1..02ada6ee5 100644
--- a/pkg/sass_api/CHANGELOG.md
+++ b/pkg/sass_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 9.4.1
+
+* No user-visible changes.
+
 ## 9.4.0
 
 * No user-visible changes.
diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
index ce05d56df..452c66f3b 100644
--- a/pkg/sass_api/pubspec.yaml
+++ b/pkg/sass_api/pubspec.yaml
@@ -2,7 +2,7 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 9.4.0
+version: 9.4.1
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
@@ -10,7 +10,7 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  sass: 1.71.0
+  sass: 1.71.1
 
 dev_dependencies:
   dartdoc: ^6.0.0
diff --git a/pubspec.yaml b/pubspec.yaml
index c3a1596b4..72e075f54 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sass
-version: 1.71.0
+version: 1.71.1-dev
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass