prep for merge

connorjs · Aug 3, 2024 · 9b9f405 · 9b9f405
1 parent f2016f0
commit 9b9f405
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -54,10 +54,10 @@ jobs:
  matrix:
  node:
  - 20.x
- #- 22.x
+ - 22.x
  platform:
  - os: ubuntu-latest
- #- os: macos-latest
+ - os: macos-latest
  - os: windows-latest
  fail-fast: false
 
@@ -89,17 +89,17 @@ jobs:
  - name: "Test 3: localsConvention, second position"
  if: success() || failure()
  run: |
- scripts/test.sh casing/casing '' casing/camelCaseOnly "--localsConvention camelCaseOnly"
+ scripts/test.sh casing/casing "" casing/camelCaseOnly "--localsConvention camelCaseOnly"
 
  - name: "Test 4: relative outdir"
  if: success() || failure()
  run: |
- scripts/test.sh foo "--outdir generated" '' '' generated/
+ scripts/test.sh foo "--outdir generated" "" "" generated/
 
  - name: "Test 5: absolute outdir"
  if: success() || failure()
  run: |
- scripts/test.sh foo "-o $GITHUB_WORKSPACE/generated" '' '' "$GITHUB_WORKSPACE"/generated/
+ scripts/test.sh foo "-o $GITHUB_WORKSPACE/generated" "" "" "$GITHUB_WORKSPACE"/generated/
 
  Publish:
  if: ${{ github.ref == 'refs/heads/main' }}

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -x
 
 # $1 is the input name, relative to `fixtures`. Required.
 input=$1
@@ -29,4 +28,4 @@ $GITHUB_WORKSPACE/dist/main.js ${beforeOpts[@]} "*.css" ${afterOpts[@]}
 
 # Use `diff` to compare the files.
 # Use `-I '//.*'` to ignore the first line (comment) which has generated path and timestamp.
-diff --color=auto --strip-trailing-cr -uI '//.*' expected.d.css.ts ${prefix}test.d.css.ts
+diff --color=auto --strip-trailing-cr -uI "//.*" expected.d.css.ts ${prefix}test.d.css.ts