Merge pull request #1758 from sass/macos-arm64

Use a self-hosted runner to release a native Mac OS ARM64 runner
sass · Aug 4, 2022 · 4de6ebe · 4de6ebe
2 parents 126f0a6 + 1a4ba52
commit 4de6ebe
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 54 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,14 +32,14 @@ jobs:
             async_args: '--cmd-args --async'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
         with: {sdk: "${{ matrix.dart_channel }}"}
       - run: dart pub get
       - name: Check out sass-spec
         uses: sass/clone-linked-repo@v1
         with: {repo: sass/sass-spec}
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - run: npm install
         working-directory: sass-spec
@@ -74,11 +74,11 @@ jobs:
             node_version: 16
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
         with: {sdk: "${{ matrix.dart_channel }}"}
       - run: dart pub get
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with: {node-version: "${{ matrix.node_version }}"}
       - run: npm install
 
@@ -115,7 +115,7 @@ jobs:
         include: [{os: ubuntu-latest, dart_channel: dev}]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
         with: {sdk: "${{ matrix.dart_channel }}"}
       - run: dart pub get
@@ -152,11 +152,11 @@ jobs:
             node_version: 16
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
         with: {sdk: "${{ matrix.dart_channel }}"}
       - run: dart pub get
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with: {node-version: "${{ matrix.node_version }}"}
       - run: npm install
       - run: dart run grinder before-test
@@ -168,7 +168,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: Analyze Dart
@@ -179,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: dartdoc sass
@@ -204,7 +204,7 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: Run checks
@@ -221,7 +221,7 @@ jobs:
         bootstrap_version: [4, 5]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - run: dart run grinder fetch-bootstrap${{matrix.bootstrap_version}}
@@ -235,7 +235,7 @@ jobs:
     needs: [double_check]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - run: dart run grinder fetch-bourbon
@@ -251,7 +251,7 @@ jobs:
     needs: [double_check]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - run: dart run grinder fetch-foundation
@@ -268,7 +268,7 @@ jobs:
     needs: [double_check]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - run: dart run grinder fetch-bulma
@@ -277,13 +277,13 @@ jobs:
         run: dart bin/sass.dart --quiet build/bulma/bulma.sass build/bulma-output.css
 
   deploy_github_linux:
-    name: "Deploy Github: Linux"
+    name: "Deploy Github: linux-ia32, linux-x64"
     runs-on: ubuntu-latest
     needs: [bootstrap, bourbon, foundation, bulma]
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: Deploy
@@ -293,7 +293,7 @@ jobs:
           GH_USER: sassbot
 
   deploy_github_linux_qemu:
-    name: "Deploy Github: Linux"
+    name: "Deploy Github: linux-${{ matrix.arch }}"
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -307,8 +307,8 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-qemu-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
       - name: Deploy
         run: |
           docker run --rm \
@@ -325,34 +325,33 @@ jobs:
           GH_TOKEN: "${{ secrets.GH_TOKEN }}"
           GH_USER: sassbot
 
-  deploy_github_macos:
-    name: "Deploy Github: Mac OS"
-    runs-on: macos-latest
-    needs: [deploy_github_linux]
-    if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: dart-lang/setup-dart@v1
-      - run: dart pub get
-      - name: Deploy
-        run: dart run grinder pkg-github-macos
-        env:
-          GH_TOKEN: "${{ secrets.GH_TOKEN }}"
-          GH_USER: sassbot
-
-  deploy_github_windows:
-    name: "Deploy Github: Windows"
-    runs-on: windows-latest
+  deploy_github:
+    name: "Deploy Github: ${{ matrix.platform }}"
+    runs-on: ${{ matrix.runner }}
     needs: [deploy_github_linux]
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
+    strategy:
+      matrix:
+        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@v2
+      - 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-windows
+        run: dart run grinder pkg-github-${{ matrix.platform }}
         env:
           GH_TOKEN: "${{ secrets.GH_TOKEN }}"
           GH_USER: sassbot
@@ -364,10 +363,10 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - name: Deploy
         run: dart run grinder pkg-npm-deploy
@@ -381,10 +380,10 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - name: Deploy
         run: dart run grinder update-bazel
@@ -399,10 +398,10 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - name: Deploy
         run: dart run grinder pkg-pub-deploy
@@ -415,7 +414,7 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: Deploy
@@ -432,7 +431,7 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: Deploy
@@ -448,7 +447,7 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
       - name: Deploy
@@ -462,7 +461,7 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: sass/sass-site
           token: ${{ secrets.GH_TOKEN }}
@@ -481,7 +480,7 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: sass/dart-sass-embedded
           token: ${{ secrets.GH_TOKEN }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.54.3
+
+* Release a native ARM64 executable for Mac OS.
+
 ## 1.54.2
 
 * No user-visible changes.

diff --git a/pkg/sass_api/CHANGELOG.md b/pkg/sass_api/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3
+
+* No user-visible changes.
+
 ## 2.0.2
 
 * No user-visible changes.

diff --git a/pkg/sass_api/pubspec.yaml b/pkg/sass_api/pubspec.yaml
@@ -2,15 +2,15 @@ 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: 2.0.2
+version: 2.0.3
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  sass: 1.54.2
+  sass: 1.54.3
 
 dev_dependencies:
   dartdoc: ^5.0.0

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: sass
-version: 1.54.2
+version: 1.54.3
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass