Merge branch 'main' into js-api-calculations

* main:
  Fix a few more deployment issues (sass#1998)
  Use the correct pub credential location for deploying sub-packages (sass#1997)
  Block release on all tests (sass#1996)
  Fix deploy configuration (sass#1994)

.github/workflows/ci.yml

@@ -285,7 +285,7 @@ jobs:
       - name: Run tests
         run: dart run test -t node -j 2
 
-  browser-test:
+  browser_tests:
     name: "Browser Tests | Dart ${{ matrix.dart_channel }}"
 
     strategy:
@@ -314,8 +314,11 @@ jobs:
     needs:
     - sass_spec_language
     - sass_spec_js
+    - sass_spec_js_browser
+    - sass_spec_js_embedded
     - dart_tests
     - node_tests
+    - browser_tests
     - static_analysis
     - dartdoc
     - format
@@ -572,8 +575,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: dart-lang/setup-dart@v1
-      - run: dart pub get
+      - uses: ./.github/util/initialize
+        with: {github-token: "${{ github.token }}"}
 
       - name: Deploy
         run: dart run grinder pkg-chocolatey-deploy
@@ -590,7 +593,7 @@ jobs:
           repository: sass/sass-site
           token: ${{ secrets.GH_TOKEN }}
 
-      - uses: EndBug/add-and-commit@v8
+      - uses: EndBug/add-and-commit@v9
         with:
           author_name: Sass Bot
           author_email: sass.bot.beep.boop@gmail.com
@@ -601,7 +604,7 @@ jobs:
     name: "Release Embedded Host"
     runs-on: ubuntu-latest
     needs: [deploy_github_linux, deploy_github_linux_qemu, deploy_github]
-    if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass-embedded'"
+    if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
     steps:
       - uses: actions/checkout@v3
         with:
@@ -634,7 +637,7 @@ jobs:
           curl https://raw.githubusercontent.com/sass/dart-sass/${{ steps.version.outputs.version }}/CHANGELOG.md > CHANGELOG.md
         shell: bash
 
-      - uses: EndBug/add-and-commit@v8
+      - uses: EndBug/add-and-commit@v9
         with:
           author_name: Sass Bot
           author_email: sass.bot.beep.boop@gmail.com

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.63.2
+
+* No user-visible changes.
+
+## 1.63.1
+
+* No user-visible changes.
+
 ## 1.63.0
 
 ### JavaScript API

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 7.1.2
+
+* No user-visible changes.
+
+## 7.1.1
+
+* No user-visible changes.
+
 ## 7.1.0
 
 * No user-visible changes.

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: 7.1.0
+version: 7.1.2
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  sass: 1.63.0
+  sass: 1.63.2
 
 dev_dependencies:
   dartdoc: ^5.0.0

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.63.0
+version: 1.63.2
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass
 
@@ -53,3 +53,4 @@ dev_dependencies:
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
   yaml: ^3.1.0
+  cli_util: ^0.4.0

tool/grind.dart

@@ -28,7 +28,7 @@ void main(List<String> args) {
   pkg.executables.value = {"sass": "bin/sass.dart"};
   pkg.chocolateyNuspec.value = _nuspec;
   pkg.homebrewRepo.value = "sass/homebrew-sass";
-  pkg.homebrewFormula.value = "sass.rb";
+  pkg.homebrewFormula.value = "Formula/sass.rb";
   pkg.jsRequires.value = [
     pkg.JSRequire("immutable", target: pkg.JSRequireTarget.all),
     pkg.JSRequire("chokidar", target: pkg.JSRequireTarget.cli),

tool/grind/subpackages.dart

@@ -6,6 +6,7 @@ import 'dart:io';
 import 'dart:convert';
 
 import 'package:cli_pkg/cli_pkg.dart' as pkg;
+import 'package:cli_util/cli_util.dart';
 import 'package:grinder/grinder.dart';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart' as p;
@@ -15,22 +16,8 @@ import 'package:yaml/yaml.dart';
 import 'utils.dart';
 
 /// The path in which pub expects to find its credentials file.
-final String _pubCredentialsPath = () {
-  // This follows the same logic as pub:
-  // https://github.com/dart-lang/pub/blob/d99b0d58f4059d7bb4ac4616fd3d54ec00a2b5d4/lib/src/system_cache.dart#L34-L43
-  String cacheDir;
-  var pubCache = Platform.environment['PUB_CACHE'];
-  if (pubCache != null) {
-    cacheDir = pubCache;
-  } else if (Platform.isWindows) {
-    var appData = Platform.environment['APPDATA']!;
-    cacheDir = p.join(appData, 'Pub', 'Cache');
-  } else {
-    cacheDir = p.join(Platform.environment['HOME']!, '.pub-cache');
-  }
-
-  return p.join(cacheDir, 'credentials.json');
-}();
+final String _pubCredentialsPath =
+    p.join(applicationConfigHome('dart'), 'pub-credentials.json');
 
 @Task('Deploy sub-packages to pub.')
 Future<void> deploySubPackages() async {