From f3093e90ba62ac415055c9704bc8fd5f0f18386c Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Fri, 22 Jul 2022 16:03:49 -0700 Subject: [PATCH 1/2] Use a self-hosted runner to release a native Mac OS ARM64 runner --- .github/workflows/ci.yml | 43 +++++++++++++++++++-------------------- CHANGELOG.md | 4 ++++ pkg/sass_api/CHANGELOG.md | 4 ++++ pkg/sass_api/pubspec.yaml | 4 ++-- pubspec.yaml | 2 +- 5 files changed, 32 insertions(+), 25 deletions(-) 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 From 1a4ba52b4cd877a6d17566543be76e8570ff14d3 Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Fri, 22 Jul 2022 17:18:59 -0700 Subject: [PATCH 2/2] Update GitHub Actions dependencies --- .github/workflows/ci.yml | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92b970f48..c7a2b92cf 100644 --- 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 @@ -283,7 +283,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 @@ -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 \ @@ -344,7 +344,7 @@ jobs: 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: @@ -363,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 @@ -380,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 @@ -398,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 @@ -414,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 @@ -431,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 @@ -447,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 @@ -461,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 }} @@ -480,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 }}