Skip to content

Commit 8443a60

Browse files
committed
fix(build): use most recent Homebrew Core formula
1 parent 8636472 commit 8443a60

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

packages/build/src/homebrew/generate-formula.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Mongosh < Formula
3535
end`;
3636

3737
describe('Homebrew generate-formula', () => {
38-
let homebrewCoreFork: GithubRepo;
38+
let homebrewCore: GithubRepo;
3939
let getFileContent: sinon.SinonStub;
4040

4141
beforeEach(() => {
@@ -45,7 +45,7 @@ describe('Homebrew generate-formula', () => {
4545
content: VALID_FORMULA
4646
});
4747

48-
homebrewCoreFork = {
48+
homebrewCore = {
4949
getFileContent
5050
} as any;
5151
});
@@ -81,15 +81,15 @@ class Mongosh < Formula
8181
end`;
8282
expect(await generateUpdatedFormula(
8383
{ version: '0.14.2', sha: 'hash' },
84-
homebrewCoreFork
84+
homebrewCore
8585
)).to.equal(updatedFormula);
8686
expect(getFileContent).to.have.been.calledOnce;
8787
});
8888

8989
it('does not update the formula if neither artifact nor URL changed', async() => {
9090
expect(await generateUpdatedFormula(
9191
{ version: '0.14.0', sha: '7b5a140689b4460a8b87008e6b7e7cb19acbc6e6cd1ab713e1a8923f3a995ca8' },
92-
homebrewCoreFork
92+
homebrewCore
9393
)).to.be.null;
9494
expect(getFileContent).to.have.been.calledOnce;
9595
});
@@ -98,7 +98,7 @@ end`;
9898
try {
9999
await generateUpdatedFormula(
100100
{ version: '0.13.0', sha: 'differentsha' },
101-
homebrewCoreFork
101+
homebrewCore
102102
);
103103
expect.fail('expected error');
104104
} catch (e) {

packages/build/src/homebrew/generate-formula.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { GithubRepo } from '../github-repo';
33

44
export async function generateUpdatedFormula(
55
context: { version: string, sha: string },
6-
homebrewCoreFork: GithubRepo
6+
homebrewCore: GithubRepo
77
): Promise<string | null> {
8-
const currentFormula = await homebrewCoreFork.getFileContent('Formula/mongosh.rb', 'master');
8+
const currentFormula = await homebrewCore.getFileContent('Formula/mongosh.rb', 'master');
99

1010
const urlMatch = /url \"([^"]+)\"/g.exec(currentFormula.content);
1111
const shaMatch = /sha256 \"([^"]+)\"/g.exec(currentFormula.content);

packages/build/src/homebrew/publish-to-homebrew.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ describe('Homebrew publish-to-homebrew', () => {
4141
.resolves('sha');
4242

4343
generateFormula
44-
.resolves('XXXX')
45-
.withArgs({ version: '1.0.0', sha: 'sha' })
44+
.rejects()
45+
.withArgs({ version: '1.0.0', sha: 'sha' }, homebrewCore)
4646
.resolves('new formula');
4747

4848
updateHomebrewFork
@@ -84,8 +84,8 @@ describe('Homebrew publish-to-homebrew', () => {
8484
.resolves('sha');
8585

8686
generateFormula
87-
.resolves('XXXX')
88-
.withArgs({ version: '1.0.0', sha: 'sha' })
87+
.rejects()
88+
.withArgs({ version: '1.0.0', sha: 'sha' }, homebrewCore)
8989
.resolves('formula');
9090

9191
updateHomebrewFork
@@ -122,8 +122,8 @@ describe('Homebrew publish-to-homebrew', () => {
122122
.resolves('sha');
123123

124124
generateFormula
125-
.resolves('XXXX')
126-
.withArgs({ version: '1.0.0', sha: 'sha' })
125+
.rejects()
126+
.withArgs({ version: '1.0.0', sha: 'sha' }, homebrewCore)
127127
.resolves('new formula');
128128

129129
updateHomebrewFork

packages/build/src/homebrew/publish-to-homebrew.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export async function publishToHomebrew(
1818

1919
const homebrewFormula = await generateFormulaFn(
2020
{ version: packageVersion, sha: packageSha },
21-
homebrewCoreFork
21+
homebrewCore
2222
);
2323
if (!homebrewFormula) {
2424
console.warn('There are no changes to the homebrew formula');

0 commit comments

Comments
 (0)