chore(ci): rebuild cmark-gfm only before tests

npm · Sep 21, 2022 · a1ef180 · a1ef180
1 parent 9f5e6bd
commit a1ef180
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 12 deletions.
diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml
@@ -85,5 +85,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w docs
diff --git a/.github/workflows/ci-libnpmaccess.yml b/.github/workflows/ci-libnpmaccess.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmaccess
diff --git a/.github/workflows/ci-libnpmdiff.yml b/.github/workflows/ci-libnpmdiff.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmdiff
diff --git a/.github/workflows/ci-libnpmexec.yml b/.github/workflows/ci-libnpmexec.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmexec
diff --git a/.github/workflows/ci-libnpmfund.yml b/.github/workflows/ci-libnpmfund.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmfund
diff --git a/.github/workflows/ci-libnpmhook.yml b/.github/workflows/ci-libnpmhook.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmhook
diff --git a/.github/workflows/ci-libnpmorg.yml b/.github/workflows/ci-libnpmorg.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmorg
diff --git a/.github/workflows/ci-libnpmpack.yml b/.github/workflows/ci-libnpmpack.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmpack
diff --git a/.github/workflows/ci-libnpmpublish.yml b/.github/workflows/ci-libnpmpublish.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmpublish
diff --git a/.github/workflows/ci-libnpmsearch.yml b/.github/workflows/ci-libnpmsearch.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmsearch
diff --git a/.github/workflows/ci-libnpmteam.yml b/.github/workflows/ci-libnpmteam.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmteam
diff --git a/.github/workflows/ci-libnpmversion.yml b/.github/workflows/ci-libnpmversion.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w libnpmversion
diff --git a/.github/workflows/ci-npmcli-arborist.yml b/.github/workflows/ci-npmcli-arborist.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w @npmcli/arborist
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -126,6 +126,8 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -ws -iwr --if-present
       - name: Conclude Check

diff --git a/.github/workflows/ci-smoke-tests.yml b/.github/workflows/ci-smoke-tests.yml
@@ -90,5 +90,7 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -w smoke-tests
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -164,6 +164,8 @@ jobs:
       - name: Link
         if: matrix
         run: node . link -f --ignore-scripts
+      - name: Rebuild cmark-gfm
+        run: node . rebuild cmark-gfm
       - name: Test
         run: node . test --ignore-scripts -iwr
       - name: Check Git Status

diff --git a/docs/test/index.js b/docs/test/index.js
@@ -9,19 +9,11 @@ const output = join(cwd, 'output')
 
 const rmOutput = () => fs.rm(output, { recursive: true, force: true }).catch(() => {})
 
-const spawnNpm = (cmd, ...args) => {
-  // remove npm config when spawning so config set by test commands don't interfere
-  const env = Object.entries(process.env)
-    .filter(([k]) => k.toLowerCase() !== 'npm_config_ignore_scripts')
-
-  return spawn(which(cmd), args, {
-    env: Object.fromEntries(env),
-    stdioString: true,
-    cwd,
-  })
-}
+const spawnNpm = (cmd, ...args) => spawn(which(cmd), args, {
+  stdioString: true,
+  cwd,
+})
 
-t.before(() => spawnNpm('node', '..', 'rebuild', 'cmark-gfm'))
 t.beforeEach(() => rmOutput())
 
 t.test('docs', async (t) => {

diff --git a/scripts/template-oss/_step-test.yml b/scripts/template-oss/_step-test.yml
@@ -3,5 +3,7 @@
 - name: Link
   if: matrix
   run: {{ rootNpmPath }} link -f --ignore-scripts
+- name: Rebuild cmark-gfm
+  run: {{ rootNpmPath }} rebuild cmark-gfm
 - name: Test
   run: {{ rootNpmPath }} test --ignore-scripts {{~#if jobRunFlags}} {{ jobRunFlags }}{{/if}}