From d0ca8e0bc9f790a2b411728a07f9ec44b168c10e Mon Sep 17 00:00:00 2001
From: Jennifer Thakar <jathak@google.com>
Date: Fri, 10 Mar 2023 15:36:32 -0800
Subject: [PATCH] Fix macOS arm64 build and release a new version (#1906)

* Revert "Remove workaround for dart-lang/setup-dart#59 (#1904)"

This reverts commit 434f2b99f154c14dc5754ed1566d1b788a3e126a.

* Bump version
---
 .github/workflows/ci.yml  | 6 ++++++
 CHANGELOG.md              | 4 ++++
 pkg/sass_api/CHANGELOG.md | 4 ++++
 pkg/sass_api/pubspec.yaml | 4 ++--
 pubspec.yaml              | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76c69496d..bdb81411d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -332,14 +332,20 @@ jobs:
         include:
           - runner: macos-latest
             platform: macos-x64
+            architecture: x64
           - runner: self-hosted
             platform: macos-arm64
+            architecture: arm64
           - runner: windows-latest
             platform: windows
+            architecture: x64
 
     steps:
       - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
+        # Workaround for dart-lang/setup-dart#59
+        with:
+          architecture: ${{ matrix.architecture }}
       - run: dart pub get
       - name: Deploy
         run: dart run grinder pkg-github-${{ matrix.platform }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bb9bca8f..1ae8d52ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.59.1
+
+* No user-visible changes.
+
 ## 1.59.0
 
 ### Command Line Interface
diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md
index 1aaf8b7ad..6dd0b405b 100644
--- a/pkg/sass_api/CHANGELOG.md
+++ b/pkg/sass_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.0.1
+
+* No user-visible changes.
+
 ## 6.0.0
 
 * **Breaking change:** All selector AST node constructors now require a
diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
index 9791fbc0f..40976bd8d 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: 6.0.0
+version: 6.0.1
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
@@ -10,7 +10,7 @@ environment:
   sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
-  sass: 1.59.0
+  sass: 1.59.1
 
 dev_dependencies:
   dartdoc: ^5.0.0
diff --git a/pubspec.yaml b/pubspec.yaml
index f5224ae9b..5dd290518 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sass
-version: 1.59.0
+version: 1.59.1
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass