Skip to content

Commit f3093e9

Browse files
committed
Use a self-hosted runner to release a native Mac OS ARM64 runner
1 parent 126f0a6 commit f3093e9

File tree

5 files changed

+32
-25
lines changed

5 files changed

+32
-25
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ jobs:
277277
run: dart bin/sass.dart --quiet build/bulma/bulma.sass build/bulma-output.css
278278

279279
deploy_github_linux:
280-
name: "Deploy Github: Linux"
280+
name: "Deploy Github: linux-ia32, linux-x64"
281281
runs-on: ubuntu-latest
282282
needs: [bootstrap, bourbon, foundation, bulma]
283283
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
@@ -293,7 +293,7 @@ jobs:
293293
GH_USER: sassbot
294294

295295
deploy_github_linux_qemu:
296-
name: "Deploy Github: Linux"
296+
name: "Deploy Github: linux-${{ matrix.arch }}"
297297
runs-on: ubuntu-latest
298298
strategy:
299299
matrix:
@@ -325,34 +325,33 @@ jobs:
325325
GH_TOKEN: "${{ secrets.GH_TOKEN }}"
326326
GH_USER: sassbot
327327

328-
deploy_github_macos:
329-
name: "Deploy Github: Mac OS"
330-
runs-on: macos-latest
331-
needs: [deploy_github_linux]
332-
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
333-
334-
steps:
335-
- uses: actions/checkout@v2
336-
- uses: dart-lang/setup-dart@v1
337-
- run: dart pub get
338-
- name: Deploy
339-
run: dart run grinder pkg-github-macos
340-
env:
341-
GH_TOKEN: "${{ secrets.GH_TOKEN }}"
342-
GH_USER: sassbot
343-
344-
deploy_github_windows:
345-
name: "Deploy Github: Windows"
346-
runs-on: windows-latest
328+
deploy_github:
329+
name: "Deploy Github: ${{ matrix.platform }}"
330+
runs-on: ${{ matrix.runner }}
347331
needs: [deploy_github_linux]
348332
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
333+
strategy:
334+
matrix:
335+
include:
336+
- runner: macos-latest
337+
platform: macos-x64
338+
architecture: x64
339+
- runner: self-hosted
340+
platform: macos-arm64
341+
architecture: arm64
342+
- runner: windows-latest
343+
platform: windows
344+
architecture: x64
349345

350346
steps:
351347
- uses: actions/checkout@v2
352348
- uses: dart-lang/setup-dart@v1
349+
# Workaround for dart-lang/setup-dart#59
350+
with:
351+
architecture: ${{ matrix.architecture }}
353352
- run: dart pub get
354353
- name: Deploy
355-
run: dart run grinder pkg-github-windows
354+
run: dart run grinder pkg-github-${{ matrix.platform }}
356355
env:
357356
GH_TOKEN: "${{ secrets.GH_TOKEN }}"
358357
GH_USER: sassbot

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.54.3
2+
3+
* Release a native ARM64 executable for Mac OS.
4+
15
## 1.54.2
26

37
* No user-visible changes.

pkg/sass_api/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.3
2+
3+
* No user-visible changes.
4+
15
## 2.0.2
26

37
* No user-visible changes.

pkg/sass_api/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ name: sass_api
22
# Note: Every time we add a new Sass AST node, we need to bump the *major*
33
# version because it's a breaking change for anyone who's implementing the
44
# visitor interface(s).
5-
version: 2.0.2
5+
version: 2.0.3
66
description: Additional APIs for Dart Sass.
77
homepage: https://github.com/sass/dart-sass
88

99
environment:
1010
sdk: ">=2.12.0 <3.0.0"
1111

1212
dependencies:
13-
sass: 1.54.2
13+
sass: 1.54.3
1414

1515
dev_dependencies:
1616
dartdoc: ^5.0.0

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: sass
2-
version: 1.54.2
2+
version: 1.54.3
33
description: A Sass implementation in Dart.
44
homepage: https://github.com/sass/dart-sass
55

0 commit comments

Comments
 (0)