Disable test on push. Homebrew fixes

Author: kevinwang5658

.github/workflows/run-all-tests-cron-linux.yaml

@@ -4,7 +4,7 @@
 name: Test all cron (Linux)
 
 on:
-  push:
+#  push:
   pull_request:
     branches:
       - release

.github/workflows/run-all-tests-cron-macos.yaml

@@ -4,7 +4,7 @@
 name: Test all cron (MacOS)
 
 on:
-  push:
+#  push:
   pull_request:
     branches:
       - release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "1.1.0",
+  "version": "1.1.0-beta1",
   "description": "Default plugin for Codify - provides 50+ declarative resources for managing development tools and system configuration across macOS and Linux",
   "main": "dist/index.js",
   "scripts": {

src/resources/homebrew/homebrew.ts

@@ -100,7 +100,7 @@ export class HomebrewResource extends Resource<HomebrewConfig> {
 
     await $.spawn(
       '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
-      { stdin: true, env: { NONINTERACTIVE: 1 } }
+      { stdin: true, interactive: true, env: { INTERACTIVE: 1, NONINTERACTIVE: undefined } }
     )
 
     const brewPath = Utils.isLinux() ? '/home/linuxbrew/.linuxbrew/bin/brew' : '/opt/homebrew/bin/brew';
@@ -124,7 +124,7 @@ export class HomebrewResource extends Resource<HomebrewConfig> {
     if (homebrewDirectory === '/opt/homebrew') {
       await $.spawnSafe(
         '/bin/bash -c "$(/usr/bin/curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"',
-        { stdin: true, env: { NONINTERACTIVE: 1 } }
+        { stdin: true, interactive: true, env: { INTERACTIVE: 1 } }
       )
     } else {
       await $.spawn(`rm -rf ${homebrewDirectory}`, { requiresRoot: true });

src/resources/homebrew/tap-parameter.ts

@@ -17,6 +17,7 @@ export class TapsParameter extends StatefulParameter<HomebrewConfig, string[]> {
     if (tapsQuery.status === SpawnStatus.SUCCESS && tapsQuery.data !== null && tapsQuery.data !== undefined) {
       return tapsQuery.data
         .split('\n')
+        .filter((t) => t === 'homebrew/bundle' || t === 'homebrew/services')
         .filter(Boolean)
     }
 
@@ -45,10 +46,12 @@ export class TapsParameter extends StatefulParameter<HomebrewConfig, string[]> {
     }
 
     const $ = getPty();
-    await $.spawn(`brew tap ${taps.join(' ')}`, {
-      interactive: true,
-      env: { HOMEBREW_NO_AUTO_UPDATE: 1 },
-    })
+    for (const tap of taps) {
+      await $.spawn(`brew tap ${tap}`, {
+        interactive: true,
+        env: { HOMEBREW_NO_AUTO_UPDATE: 1 },
+      });
+    }
   }
 
   private async uninstallTaps(taps: string[]): Promise<void> {
@@ -57,10 +60,12 @@ export class TapsParameter extends StatefulParameter<HomebrewConfig, string[]> {
     }
 
     const $ = getPty();
-    await $.spawn(`brew untap ${taps.join(' ')}`, {
-      interactive: true,
-      env: { HOMEBREW_NO_AUTO_UPDATE: 1 },
-    })
+    for (const tap of taps) {
+      await $.spawn(`brew untap ${tap}`, {
+        interactive: true,
+        env: { HOMEBREW_NO_AUTO_UPDATE: 1 },
+      });
+    }
   }
 
 }

test/homebrew/taps.test.ts

@@ -11,7 +11,7 @@ describe('Homebrew taps tests', { skip: !Utils.isMacOS() }, () => {
     // Plans correctly and detects that brew is not installed
     await PluginTester.fullTest(pluginPath, [{
       type: 'homebrew',
-      taps: ['cirruslabs/cli'],
+      taps: ['cirruslabs/cli', 'hashicorp/tap'],
     }], {
       validateApply: async () => {
         expect(await testSpawn('brew tap')).toMatchObject({ data: expect.stringContaining('cirruslabs/cli') });