Merge pull request #70 from TrentBrown/tb-portreeve-homebrew-smoke-cleanup

Fix disposable Homebrew smoke cleanup

Author: TrentBrown

scripts/smoke-homebrew-candidate.js

@@ -12,6 +12,8 @@ import { renderHomebrewFormula } from './release-lib.js';
 import { readReleaseRecord } from './release-record.js';
 
 const TAP_NAME = 'portreeve/smoke';
+export const HOMEBREW_SMOKE_FORMULA = `${TAP_NAME}/portreeve`;
+export const HOMEBREW_SMOKE_CASK = `${TAP_NAME}/portreeve-app`;
 
 /**
  * @param {{record: Record<string, any>, releaseRoot: string, stagingRoot: string}}
@@ -147,7 +149,7 @@ export async function smokeHomebrewCandidate(options) {
 
     await requireSuccess(
       run,
-      ['brew', 'install', `${TAP_NAME}/portreeve`],
+      ['brew', 'install', HOMEBREW_SMOKE_FORMULA],
       'Homebrew formula installation',
     );
     formulaInstalled = true;
@@ -175,7 +177,7 @@ export async function smokeHomebrewCandidate(options) {
         'install',
         '--cask',
         `--appdir=${applicationDirectory}`,
-        `${TAP_NAME}/portreeve-app`,
+        HOMEBREW_SMOKE_CASK,
       ],
       'Homebrew cask installation',
     );
@@ -196,15 +198,15 @@ export async function smokeHomebrewCandidate(options) {
       await collectCleanupError(
         cleanupErrors,
         run,
-        ['brew', 'uninstall', '--cask', 'portreeve-app'],
+        ['brew', 'uninstall', '--cask', HOMEBREW_SMOKE_CASK],
         'Homebrew cask cleanup',
       );
     }
     if (formulaInstalled) {
       await collectCleanupError(
         cleanupErrors,
         run,
-        ['brew', 'uninstall', '--formula', 'portreeve'],
+        ['brew', 'uninstall', '--formula', HOMEBREW_SMOKE_FORMULA],
         'Homebrew formula cleanup',
       );
     }

test/release/homebrew-smoke.test.js

@@ -4,7 +4,11 @@ import { afterEach, expect, test } from 'bun:test';
 import { chmod, mkdir, mkdtemp, readFile, rm, stat, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { stageHomebrewCandidate } from '../../scripts/smoke-homebrew-candidate.js';
+import {
+  HOMEBREW_SMOKE_CASK,
+  HOMEBREW_SMOKE_FORMULA,
+  stageHomebrewCandidate,
+} from '../../scripts/smoke-homebrew-candidate.js';
 import { desktopDmgName } from '../../scripts/desktop-release-lib.js';
 import {
   artifactName,
@@ -92,6 +96,11 @@ test('requires the complete formula and cask artifact set', async () => {
   ).rejects.toThrow('exactly four native executables');
 });
 
+test('fully qualifies disposable formula and cask names', () => {
+  expect(HOMEBREW_SMOKE_FORMULA).toBe('portreeve/smoke/portreeve');
+  expect(HOMEBREW_SMOKE_CASK).toBe('portreeve/smoke/portreeve-app');
+});
+
 async function temporaryDirectory() {
   const directory = await mkdtemp(join(tmpdir(), 'portreeve-homebrew-test-'));
   directories.push(directory);