Merge main into feature.v2

.github/util/initialize/action.yml

@@ -45,7 +45,7 @@ runs:
     # downloading repo via GitHub API.
     - name: Check out the language repo
       if: github.event_name != 'pull_request'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with: {repository: sass/sass, path: build/language}
 
     - name: Generate Dart from protobuf

.github/workflows/build-linux.yml

@@ -21,24 +21,18 @@ jobs:
           - image: docker.io/library/dart
             platform: linux/amd64
             target: linux-x64
-          - image: docker.io/library/dart
-            platform: linux/amd64
-            target: linux-ia32
           - image: docker.io/library/dart
             platform: linux/arm64
             target: linux-arm64
           - image: docker.io/library/dart
             platform: linux/arm/v7
             target: linux-arm
-          - image: docker.io/library/debian:trixie-slim
+          - image: docker.io/library/dart
             platform: linux/riscv64
             target: linux-riscv64
           - image: ghcr.io/dart-musl/dart
             platform: linux/amd64
             target: linux-x64-musl
-          - image: ghcr.io/dart-musl/dart
-            platform: linux/amd64
-            target: linux-ia32-musl
           - image: ghcr.io/dart-musl/dart
             platform: linux/arm64
             target: linux-arm64-musl
@@ -51,9 +45,6 @@ jobs:
           - image: ghcr.io/dart-android/dart
             platform: linux/amd64
             target: android-x64
-          - image: ghcr.io/dart-android/dart
-            platform: linux/amd64
-            target: android-ia32
           - image: ghcr.io/dart-android/dart
             platform: linux/arm64
             target: android-arm64
@@ -65,7 +56,7 @@ jobs:
             target: android-riscv64
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
@@ -74,7 +65,7 @@ jobs:
         run: docker run --privileged --rm registry.fedoraproject.org/fedora-minimal /bin/sh -c "microdnf install --assumeyes --nodocs --setopt=install_weak_deps=False qemu-user-static systemd-udev && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc && /usr/lib/systemd/systemd-binfmt --unregister && /usr/lib/systemd/systemd-binfmt"
 
       - name: Build
-        if: matrix.image != 'ghcr.io/dart-android/dart' && matrix.image != 'docker.io/library/debian:trixie-slim'
+        if: matrix.image != 'ghcr.io/dart-android/dart'
         run: |
           docker run --rm -i \
                      --platform ${{ matrix.platform }} \
@@ -102,35 +93,6 @@ jobs:
           dart run grinder pkg-standalone-${{ matrix.target }}
           EOF
 
-      # https://github.com/dart-lang/dart-docker/issues/96#issuecomment-1669860829
-      # There is no official riscv64 dart container image yet, build on debian:trixie instead.
-      # The setup is adopted from: https://github.com/dart-lang/dart-docker/blob/main/Dockerfile-debian.template
-      - name: Build
-        if: matrix.image == 'docker.io/library/debian:trixie-slim'
-        run: |
-          DART_CHANNEL=stable
-          DART_VERSION=$(curl -fsSL https://storage.googleapis.com/dart-archive/channels/$DART_CHANNEL/release/latest/VERSION | yq .version)
-          curl -fsSLO "https://storage.googleapis.com/dart-archive/channels/$DART_CHANNEL/release/$DART_VERSION/sdk/dartsdk-${{ matrix.target }}-release.zip"
-
-          docker run --rm -i \
-                     --platform ${{ matrix.platform }} \
-                     --volume "$PWD:$PWD" \
-                     --workdir "$PWD" \
-                     ${{ matrix.image }} <<'EOF'
-          set -e
-          apt-get update
-          apt-get install -y --no-install-recommends bind9-dnsutils ca-certificates curl git openssh-client unzip
-
-          export DART_SDK=/usr/lib/dart
-          export PATH=$DART_SDK/bin:/root/.pub-cache/bin:$PATH
-
-          SDK="dartsdk-${{ matrix.target }}-release.zip"
-          unzip "$SDK" && mv dart-sdk "$DART_SDK" && rm "$SDK"
-
-          dart pub get
-          dart run grinder pkg-standalone-${{ matrix.target }}
-          EOF
-
       - name: Generate artifact attestation
         if: github.ref_type == 'tag'
         uses: actions/attest-build-provenance@v2

.github/workflows/build-macos.yml

@@ -24,7 +24,7 @@ jobs:
             runner: macos-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}

.github/workflows/build-windows.yml

@@ -20,13 +20,11 @@ jobs:
         include:
           - arch: x64
             runner: windows-latest
-          - arch: ia32
-            runner: windows-latest
           - arch: arm64
-            runner: windows-arm64
+            runner: windows-11-arm
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     if: "github.ref_type == 'tag' && github.event.repository.fork == false"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 

.github/workflows/release-sass-api.yml

@@ -0,0 +1,29 @@
+# This has to be a separate workflow to satisfy pub.dev's somewhat draconian
+# requirements for when and how GitHub actions are allowed publish packages.
+# Specifically, it requires that each publish action be triggered by a tag that
+# contains the version number for that action, so we can't just publish sass_api
+# as part of the standard sass release flow because that was triggered by a tag
+# with the sass version number.
+name: Release sass-api
+
+on:
+  push:
+    tags: ['sass-api-[0-9]+.[0-9]+.*']
+
+jobs:
+  deploy_sass_api:
+    if: github.event.repository.fork == false
+    name: Deploy sass_api
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+      - uses: ./.github/util/initialize
+        with: {github-token: "${{ github.token }}"}
+
+      - name: Deploy
+        run: dart run grinder deploy-sass-api
+        env:
+          PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"
+          GH_TOKEN: "${{ secrets.GH_TOKEN }}"
+          GH_USER: sassbot

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
     needs: [build_linux, build_macos, build_windows]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
@@ -73,59 +73,39 @@ jobs:
           UPDATE_SASS_SASS_REPO: false
           NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
 
-  deploy_bazel:
-    name: Deploy Bazel
-    runs-on: ubuntu-latest
-    needs: [deploy_npm]
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/util/initialize
-        with: {github-token: "${{ github.token }}"}
-
-      - name: Deploy
-        run: dart run grinder update-bazel
-        env:
-          GH_TOKEN: "${{ secrets.GH_TOKEN }}"
-          GH_USER: sassbot
-
   deploy_pub:
     name: Deploy Pub
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          # We have to use this rather than the implicit GitHub token so that
+          # pushing a new tag triggers another action.
+          token: ${{ secrets.GH_TOKEN }}
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
       - name: Deploy
         run: dart run grinder protobuf pkg-pub-deploy
         env: {PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"}
 
-  deploy_sass_api:
-    name: Deploy sass_api
-    runs-on: ubuntu-latest
-    needs: [deploy_pub]
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/util/initialize
-        with: {github-token: "${{ github.token }}"}
-
-      - name: Deploy
-        run: dart run grinder deploy-sass-api
-        env:
-          PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"
-          GH_TOKEN: "${{ secrets.GH_TOKEN }}"
-          GH_USER: sassbot
+      - name: Get Sass API version
+        id: sass-api-version
+        run: |
+          echo "version=$(cat pkg/sass_api/pubspec.yaml | sed -nE 's/version: (.*)/\1/p')" | tee --append "$GITHUB_OUTPUT"
+      # This should be /-separated rather than hyphenated, but pub.dev doesn't
+      # currently allow that (dart-lang/pub-dev#8690).
+      - run: git tag sass-api-${{ steps.sass-api-version.outputs.version }}
+      - run: git push --tag
 
   deploy_sass_parser:
     name: Deploy sass-parser
     runs-on: ubuntu-latest
     needs: [deploy_npm]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           token: ${{ secrets.GH_TOKEN }}
       # Set up .npmrc file to publish to npm
@@ -162,7 +142,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dart-lang/setup-dart@v1
       - run: dart pub get
 
@@ -177,7 +157,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
@@ -191,7 +171,7 @@ jobs:
     needs: [deploy_npm]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           repository: sass/sass-site
           token: ${{ secrets.SASS_SITE_TOKEN }}
@@ -219,7 +199,7 @@ jobs:
     needs: [deploy_github]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           repository: sass/embedded-host-node
           token: ${{ secrets.GH_TOKEN }}
@@ -236,7 +216,8 @@ jobs:
           for dir in $(ls npm); do
             cat "npm/$dir/package.json" |
                 jq --arg version ${{ steps.version.outputs.version }} '
-                  .version |= $version
+                  .version |= $version |
+                  if (.dependencies.sass) then .dependencies.sass |= $version end
                 ' > package.json.tmp &&
               mv package.json.tmp "npm/$dir/package.json"
           done

.github/workflows/test-vendor.yml

@@ -15,7 +15,7 @@ jobs:
         bootstrap_version: [4, 5]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}
 
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/util/initialize
         with: {github-token: "${{ github.token }}"}