From eb66325ddd05b7b0792ccdd0074e1c6bd2d30ce3 Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Fri, 8 Jan 2021 14:36:24 -0800
Subject: [PATCH] Style changes

---
 .github/workflows/ci.yml | 69 +++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98c99a21..5da9c5f5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,20 +1,20 @@
 name: CI
 
+env:
+  # Run on Node 14 because node-fibers doesn't support odd-numbered Node
+  # versions.
+  DEFAULT_NODE_VERSION: 14
+
 on:
   push:
-    branches:
-      - master
-      # Feature branches beginning with "feature."
-      - feature.*
-    tags:
-      - '**'
+    branches: [master, feature.*]
+    tags: ['**']
   pull_request:
 
 jobs:
   sass_spec:
-    runs-on: ubuntu-latest
-
     name: "sass-spec | Dart ${{ matrix.dart_channel }} | ${{ matrix.async_label }}"
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
@@ -30,8 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: cedx/setup-dart@v2
-        with:
-          release-channel: "${{ matrix.dart_channel }}"
+        with: {release-channel: "${{ matrix.dart_channel }}"}
       - run: dart pub get
       # Set up the environment to run the sass-spec runner which is written in Ruby
       - name: Set up sass-spec
@@ -52,29 +51,23 @@ jobs:
       - name: Run specs
         run: bundle exec sass-spec.rb --dart .. $extra_args
         working-directory: sass-spec
-        env:
-          extra_args: "${{ matrix.async_args }}"
+        env: {extra_args: "${{ matrix.async_args }}"}
 
   dart_tests:
-    runs-on: "${{ matrix.os }}"
-
     name: "Dart tests | Dart ${{ matrix.dart_channel }} | ${{ matrix.os }}"
+    runs-on: "${{ matrix.os }}"
 
     strategy:
       fail-fast: false
-
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         dart_channel: [stable]
-        include:
-          - os: ubuntu-latest
-            dart_channel: dev
+        include: [{os: ubuntu-latest, dart_channel: dev}]
 
     steps:
       - uses: actions/checkout@v2
       - uses: cedx/setup-dart@v2
-        with:
-          release-channel: "${{ matrix.dart_channel }}"
+        with: {release-channel: "${{ matrix.dart_channel }}"}
       - run: dart pub get
       - run: dart pub run grinder pkg-standalone-dev
       - name: Run tests
@@ -86,9 +79,8 @@ jobs:
   # They next need to be rotated April 2021. See
   # https://github.com/nodejs/Release.
   node_tests:
-    runs-on: "${{ matrix.os }}"
-
     name: "Node tests | Dart ${{ matrix.dart_channel }} | Node ${{ matrix.node_version }} | ${{ matrix.os }}"
+    runs-on: "${{ matrix.os }}"
 
     strategy:
       fail-fast: false
@@ -96,8 +88,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         dart_channel: [stable]
-        # Run on Node 14 until laverdet/node-fibers#445 is fixed.
-        node_version: [14]
+        node_version: ["${{ env.DEFAULT_NODE_VERSION }}"]
         include:
           # Include LTS versions on Ubuntu
           - os: ubuntu-latest
@@ -109,17 +100,15 @@ jobs:
 # TODO(nweiz): Re-enable these when dart-lang/sdk#44181 or dart-lang/test#1363 is fixed.
 #          - os: ubuntu-latest
 #            dart_channel: dev
-#            node_version: 14
+#            node_version: "${{ env.DEFAULT_NODE_VERSION }}"
 
     steps:
       - uses: actions/checkout@v2
       - uses: cedx/setup-dart@v2
-        with:
-          release-channel: "${{ matrix.dart_channel }}"
+        with: {release-channel: "${{ matrix.dart_channel }}"}
       - run: dart pub get
       - uses: actions/setup-node@v2
-        with:
-          node-version: '${{ matrix.node_version }}'
+        with: {node-version: "${{ matrix.node_version }}"}
       - run: npm install
       - run: dart pub run grinder before-test
       - name: Run tests
@@ -198,7 +187,7 @@ jobs:
           GITHUB_USER: sassbot
 
   deploy_npm:
-    name: "Deploy Npm"
+    name: Deploy npm
     runs-on: ubuntu-latest
     needs: [sanity_checks]
     if: "startsWith('refs/tags/', github.ref) && github.repository == 'sass/dart-sass'"
@@ -208,15 +197,14 @@ jobs:
       - uses: cedx/setup-dart@v2
       - run: dart pub get
       - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
+        with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - name: Deploy
         run: dart pub run grinder pkg-npm-deploy
         env:
           NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
 
   deploy_bazel:
-    name: "Deploy Bazel"
+    name: Deploy Bazel
     runs-on: ubuntu-latest
     needs: [deploy_npm]
     if: "startsWith('refs/tags/', github.ref) && github.repository == 'sass/dart-sass'"
@@ -226,8 +214,7 @@ jobs:
       - uses: cedx/setup-dart@v2
       - run: dart pub get
       - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
+        with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - name: Deploy
         run: dart pub run grinder update-bazel
 
@@ -242,12 +229,10 @@ jobs:
       - uses: cedx/setup-dart@v2
       - run: dart pub get
       - uses: actions/setup-node@v2
-        with:
-          node-version: '14'
+        with: {node-version: "${{ env.DEFAULT_NODE_VERSION }}"}
       - name: Deploy
         run: dart pub run grinder pkg-pub-deploy
-        env:
-          PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"
+        env: {PUB_CREDENTIALS: "${{ secrets.PUB_CREDENTIALS }}"}
 
   deploy_homebrew:
     name: "Deploy Homebrew"
@@ -277,8 +262,7 @@ jobs:
       - run: dart pub get
       - name: Deploy
         run: dart pub run grinder pkg-chocolatey-deploy
-        env:
-          CHOCOLATEY_TOKEN: "${{ secrets.CHOCOLATEY_TOKEN }}"
+        env: {CHOCOLATEY_TOKEN: "${{ secrets.CHOCOLATEY_TOKEN }}"}
 
   deploy_website:
     name: "Deploy sass-lang.com"
@@ -290,5 +274,4 @@ jobs:
       - uses: actions/checkout@v2
       - name: Deploy
         run: tool/github-action/deploy/heroku.sh
-        env:
-          HEROKU_TOKEN: "${{ secrets.HEROKU_TOKEN }}"
+        env: {HEROKU_TOKEN: "${{ secrets.HEROKU_TOKEN }}"}