Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'main' of github.com:sass/dart-sass into feature.color-4 #2109

Merged
merged 28 commits into from
Oct 6, 2023
Merged

Merge branch 'main' of github.com:sass/dart-sass into feature.color-4 #2109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
58cbab4
Stop working around dart-lang/linter#4381 (#2071)
nex3 Aug 21, 2023
af0118a
Improve `sass --embedded` performance (#2013)
ntkme Sep 1, 2023
fddf421
Don't try to load absolute URLs from the base importer (#2077)
nex3 Sep 8, 2023
77e208c
Run cli compilations in parallel dart isolates (#2078)
ntkme Sep 9, 2023
bdb145f
Fix example (#2074)
danog Sep 12, 2023
5c31d1f
Re-enable new calculation functions (#2080)
nex3 Sep 14, 2023
7370d6a
Fix changelog for 1.67.0 (#2085)
nex3 Sep 15, 2023
37e0ed5
Fix source span for calculation deprecation warnings (#2084)
ntkme Sep 15, 2023
c22c84d
Update changelog for sass/embedded-host-node#248 (#2086)
nex3 Sep 18, 2023
69f1847
CI: Configure dependabot to update GitHub Actions, too (#2087)
olleolleolle Sep 18, 2023
13c9fb3
Expose the containing URL to importers under some circumstances (#2083)
nex3 Sep 18, 2023
873e91e
Cut a release (#2090)
nex3 Sep 21, 2023
de618fa
Fix an error during embedded compiler shutdown (#2092)
ntkme Sep 21, 2023
81c0be6
Avoid useless allocations for interpolations without maps (#2095)
stof Sep 26, 2023
0b6a103
Deprecate Deprecation.calcInterp (#2096)
nex3 Sep 26, 2023
9177f14
Update protocol-version during embedded-host-node release (#2097)
ntkme Sep 27, 2023
23f0143
Forbid LLM contributions (#2100)
nex3 Sep 27, 2023
00823e0
Rephrase errors for numbers that must be unitless or % (#2101)
nex3 Sep 28, 2023
ff56fc5
Implement support for the relative color syntax of CSS Color 5 (#2098)
stof Sep 28, 2023
f66cb47
Bump docker/setup-qemu-action from 2 to 3 (#2089)
dependabot[bot] Sep 29, 2023
507e439
Bump actions/checkout from 3 to 4 (#2088)
dependabot[bot] Sep 29, 2023
4255930
Update the version of Sass used by the website on release (#2102)
nex3 Sep 30, 2023
16b8512
Switch to the GitHub-hosted MacOS ARM64 runner (#2103)
nex3 Oct 3, 2023
310904e
Fix a race condition preventing embedded compiler to shutdown after a…
ntkme Oct 5, 2023
ce545c2
Implement first class mixins (#2073)
connorskees Oct 5, 2023
8e6a26c
Cut a release (#2107)
nex3 Oct 5, 2023
dde3abf
Merge branch 'main' of github.com:sass/dart-sass into feature.color-4
nex3 Oct 6, 2023
2e12e3f
Poke CI
nex3 Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
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
View file
Open in desktop
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