Skip to content

Commit

Permalink
Merge branch 'feature.color-4' into color-spaces-js
Browse files Browse the repository at this point in the history
* feature.color-4: (30 commits)
  Update for `lch()` tests (sass#2108)
  Add support for relative color syntax (sass#2112)
  Update for `oklab()` tests (sass#2094)
  Poke CI
  Cut a release (sass#2107)
  Implement first class mixins (sass#2073)
  Fix a race condition preventing embedded compiler to shutdown after a protocol error (sass#2106)
  Switch to the GitHub-hosted MacOS ARM64 runner (sass#2103)
  Update the version of Sass used by the website on release (sass#2102)
  Bump actions/checkout from 3 to 4 (sass#2088)
  Bump docker/setup-qemu-action from 2 to 3 (sass#2089)
  Implement support for the relative color syntax of CSS Color 5 (sass#2098)
  Rephrase errors for numbers that must be unitless or % (sass#2101)
  Forbid LLM contributions (sass#2100)
  Update protocol-version during embedded-host-node release (sass#2097)
  Deprecate Deprecation.calcInterp (sass#2096)
  Avoid useless allocations for interpolations without maps (sass#2095)
  Fix an error during embedded compiler shutdown (sass#2092)
  Cut a release (sass#2090)
  Expose the containing URL to importers under some circumstances (sass#2083)
  ...
  • Loading branch information
jgerigmeyer committed Oct 12, 2023
2 parents ef6f2e3 + 5b3de08 commit 8ff4546
Show file tree
Hide file tree
Showing 94 changed files with 3,559 additions and 1,426 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
76 changes: 44 additions & 32 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
- run: dart format --fix .
- run: git diff --exit-code
Expand All @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -43,7 +43,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
async_args: '--cmd-args --async'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with:
dart-sdk: ${{ matrix.dart_channel }}
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
node-version: 18

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with:
dart-sdk: ${{ matrix.dart_channel }}
Expand All @@ -137,6 +137,7 @@ jobs:
sass_spec_js_embedded:
name: 'JS API Tests | Embedded | Node ${{ matrix.node-version }} | ${{ matrix.os }}'
runs-on: ${{ matrix.os }}-latest
if: "github.event_name != 'pull_request' || !contains(github.event.pull_request.body, 'skip sass-embedded')"

strategy:
fail-fast: false
Expand All @@ -151,7 +152,7 @@ jobs:
node-version: 14

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with:
github-token: ${{ github.token }}
Expand Down Expand Up @@ -197,7 +198,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: browser-actions/setup-chrome@v1
- uses: ./.github/util/initialize
with:
Expand Down Expand Up @@ -239,7 +240,7 @@ jobs:
# include: [{os: ubuntu-latest, dart_channel: dev}]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with:
dart-sdk: ${{ matrix.dart_channel }}
Expand Down Expand Up @@ -277,7 +278,7 @@ jobs:
dart_channel: dev
node-version: 18
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with:
dart-sdk: ${{ matrix.dart_channel }}
Expand All @@ -298,7 +299,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: browser-actions/setup-chrome@v1
- uses: ./.github/util/initialize
with:
Expand Down Expand Up @@ -328,7 +329,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -346,7 +347,7 @@ jobs:
bootstrap_version: [4, 5]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -361,7 +362,7 @@ jobs:
needs: [double_check]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -378,7 +379,7 @@ jobs:
needs: [double_check]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -396,7 +397,7 @@ jobs:
needs: [double_check]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -412,7 +413,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -436,11 +437,11 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
- name: Deploy
run: |
docker run --rm \
Expand All @@ -466,15 +467,16 @@ jobs:
- runner: macos-latest
platform: macos-x64
architecture: x64
- runner: self-hosted
# https://github.blog/2023-10-02-introducing-the-new-apple-silicon-powered-m1-macos-larger-runner-for-github-actions/
- runner: macos-latest-xlarge
platform: macos-arm64
architecture: arm64
- runner: windows-latest
platform: windows
architecture: x64

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
# Workaround for dart-lang/setup-dart#59
with:
Expand All @@ -494,7 +496,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -510,7 +512,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -527,7 +529,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -542,7 +544,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -560,7 +562,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dart-lang/setup-dart@v1
- run: dart pub get

Expand All @@ -577,7 +579,7 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/util/initialize
with: {github-token: "${{ github.token }}"}

Expand All @@ -588,14 +590,21 @@ jobs:
deploy_website:
name: "Deploy sass-lang.com"
runs-on: ubuntu-latest
needs: [bootstrap, bourbon, foundation, bulma]
needs: [deploy_npm]
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: sass/sass-site
token: ${{ secrets.SASS_SITE_TOKEN }}

- name: Get version
id: version
run: echo "version=${GITHUB_REF##*/}" | tee --append "$GITHUB_OUTPUT"

- name: Update Dart Sass version
run: npm install sass@${{ steps.version.outputs.version }}

- uses: EndBug/add-and-commit@v9
with:
author_name: Sass Bot
Expand All @@ -609,14 +618,16 @@ jobs:
needs: [deploy_github_linux, deploy_github_linux_qemu, deploy_github]
if: "startsWith(github.ref, 'refs/tags/') && github.repository == 'sass/dart-sass'"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: sass/embedded-host-node
token: ${{ secrets.GH_TOKEN }}

- name: Get version
id: version
run: echo "version=${GITHUB_REF##*/}" | tee --append "$GITHUB_OUTPUT"
run: |
echo "version=${GITHUB_REF##*/}" | tee --append "$GITHUB_OUTPUT"
echo "protocol_version=$(curl -fsSL -H "Authorization: Bearer ${{ github.token }}" https://raw.githubusercontent.com/sass/sass/HEAD/spec/EMBEDDED_PROTOCOL_VERSION)" | tee --append "$GITHUB_OUTPUT"
- name: Update version
run: |
Expand All @@ -631,13 +642,14 @@ jobs:
# Update main package version and dependencies on binary packages
cat package.json |
jq --arg version ${{ steps.version.outputs.version }} '
jq --arg version ${{ steps.version.outputs.version }} --arg protocol_version ${{ steps.version.outputs.protocol_version }} '
.version |= $version |
."compiler-version" |= $version |
."protocol-version" |= $protocol_version |
.optionalDependencies = (.optionalDependencies | .[] |= $version)
' > package.json.tmp &&
mv package.json.tmp package.json
curl https://raw.githubusercontent.com/sass/dart-sass/${{ steps.version.outputs.version }}/CHANGELOG.md > CHANGELOG.md
curl -fsSL -H "Authorization: Bearer ${{ github.token }}" https://raw.githubusercontent.com/sass/dart-sass/${{ steps.version.outputs.version }}/CHANGELOG.md > CHANGELOG.md
shell: bash

- uses: EndBug/add-and-commit@v9
Expand Down
Loading

0 comments on commit 8ff4546

Please sign in to comment.