fix: dont use -ws flags in release workflow when not necessary (#226)

npm · Oct 5, 2022 · b313218 · b313218
1 parent f6a0268
commit b313218
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 5 deletions.
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -144,7 +144,7 @@ jobs:
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
-        run: npm test --ignore-scripts -ws -iwr --if-present
+        run: npm test --ignore-scripts --if-present
       - name: Conclude Check
         uses: LouisBrunner/checks-action@v1.3.1
         if: always()

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -133,7 +133,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           npm exec --offline -- template-oss-release-manager
-          npm run rp-pull-request --ignore-scripts -ws -iwr --if-present
+          npm run rp-pull-request --ignore-scripts --if-present
       - name: Commit
         id: commit
         env:

diff --git a/lib/config.js b/lib/config.js
@@ -178,7 +178,7 @@ const getFullConfig = async ({
     pkgDir: posixDir(pkgPath),
     pkgGlob: posixGlob(pkgPath),
     pkgFlags: isRoot ? '-iwr' : `-w ${pkgJson.name}`,
-    allFlags: '-ws -iwr --if-present',
+    allFlags: `${workspaces.length ? '-ws -iwr' : ''} --if-present`.trim(),
     workspacePaths,
     workspaceGlobs: workspacePaths.map(posixGlob),
     // booleans to control application of updates

diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs
@@ -351,7 +351,7 @@ jobs:
       - name: Add Problem Matcher
         run: echo "::add-matcher::.github/matchers/tap.json"
       - name: Test
-        run: npm test --ignore-scripts -ws -iwr --if-present
+        run: npm test --ignore-scripts --if-present
       - name: Conclude Check
         uses: LouisBrunner/checks-action@v1.3.1
         if: always()
@@ -873,7 +873,7 @@ jobs:
           GITHUB_TOKEN: \${{ secrets.GITHUB_TOKEN }}
         run: |
           npm exec --offline -- template-oss-release-manager
-          npm run rp-pull-request --ignore-scripts -ws -iwr --if-present
+          npm run rp-pull-request --ignore-scripts --if-present
       - name: Commit
         id: commit
         env:

diff --git a/test/apply/release.js b/test/apply/release.js
@@ -0,0 +1,27 @@
+const t = require('tap')
+const { join } = require('path')
+const setup = require('../setup.js')
+
+t.test('no workspace flags in commands', async (t) => {
+  const s = await setup(t)
+  await s.apply()
+
+  const release = await s.readFile(join('.github', 'workflows', 'release.yml'))
+
+  t.match(release, '--ignore-scripts --if-present\n')
+  t.notMatch(release, '--ignore-scripts -ws -iwr --if-present\n')
+})
+
+t.test('uses workspace flags in commands', async (t) => {
+  const s = await setup(t, {
+    workspaces: {
+      a: 'a',
+    },
+  })
+  await s.apply()
+
+  const release = await s.readFile(join('.github', 'workflows', 'release.yml'))
+
+  t.notMatch(release, '--ignore-scripts --if-present\n')
+  t.match(release, '--ignore-scripts -ws -iwr --if-present\n')
+})