diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 834dfbab1..92b970f48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -277,7 +277,7 @@ 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'" @@ -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: @@ -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: 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index acb32aeca..fad8863bc 100644 --- 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 index 9b0d1ea2b..785decf21 100644 --- 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 index d0d1c8bfe..378b063dd 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: 2.0.2 +version: 2.0.3 description: Additional APIs for Dart Sass. homepage: https://github.com/sass/dart-sass @@ -10,7 +10,7 @@ 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 index a38f1dc2f..ac9b92691 100644 --- 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