Skip to content

chore(build): ensure remote information is up-to-date MONGOSH-610 #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 1, 2021
Merged

chore(build): ensure remote information is up-to-date MONGOSH-610 #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions packages/build/src/git/repository-status.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ describe('git repository-status', () => {

describe('verifyGitStatus', () => {
let getRepositoryStatus: sinon.SinonStub;
let spawnSync: sinon.SinonStub;

beforeEach(()=> {
getRepositoryStatus = sinon.stub();
spawnSync = sinon.stub();
});

[ 'master', 'main', 'release/v0.8.0', 'release/v0.8.x' ].forEach(branchName => {
Expand All @@ -28,8 +30,9 @@ describe('git repository-status', () => {
hasUnpushedTags: false
};
getRepositoryStatus.returns(status);
const returnedStatus = verifyGitStatus('root', getRepositoryStatus);
const returnedStatus = verifyGitStatus('root', getRepositoryStatus, spawnSync);
expect(returnedStatus).to.equal(status);
expect(spawnSync).to.have.been.calledWith('git', ['fetch', '--tags'], sinon.match.object);
});
});

Expand All @@ -40,7 +43,7 @@ describe('git repository-status', () => {
};
getRepositoryStatus.returns(status);
try {
verifyGitStatus('root', getRepositoryStatus);
verifyGitStatus('root', getRepositoryStatus, spawnSync);
} catch (e) {
expect(e.message).to.contain('Could not determine local repository information');
return;
Expand All @@ -60,7 +63,7 @@ describe('git repository-status', () => {
};
getRepositoryStatus.returns(status);
try {
verifyGitStatus('root', getRepositoryStatus);
verifyGitStatus('root', getRepositoryStatus, spawnSync);
} catch (e) {
expect(e.message).to.contain('The current branch does not match');
return;
Expand All @@ -80,7 +83,7 @@ describe('git repository-status', () => {
};
getRepositoryStatus.returns(status);
try {
verifyGitStatus('root', getRepositoryStatus);
verifyGitStatus('root', getRepositoryStatus, spawnSync);
} catch (e) {
expect(e.message).to.contain('The branch you are on is not tracking any remote branch.');
return;
Expand All @@ -100,7 +103,7 @@ describe('git repository-status', () => {
};
getRepositoryStatus.returns(status);
try {
verifyGitStatus('root', getRepositoryStatus);
verifyGitStatus('root', getRepositoryStatus, spawnSync);
} catch (e) {
expect(e.message).to.contain('Your local repository is not clean or diverged from the remote branch');
return;
Expand All @@ -120,7 +123,7 @@ describe('git repository-status', () => {
};
getRepositoryStatus.returns(status);
try {
verifyGitStatus('root', getRepositoryStatus);
verifyGitStatus('root', getRepositoryStatus, spawnSync);
} catch (e) {
expect(e.message).to.contain('Your local repository is not clean or diverged from the remote branch');
return;
Expand All @@ -140,7 +143,7 @@ describe('git repository-status', () => {
};
getRepositoryStatus.returns(status);
try {
verifyGitStatus('root', getRepositoryStatus);
verifyGitStatus('root', getRepositoryStatus, spawnSync);
} catch (e) {
expect(e.message).to.contain('You have local tags that are not pushed to the remote');
return;
Expand Down
8 changes: 7 additions & 1 deletion packages/build/src/git/repository-status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@ const RELEASE_BRANCH = /^release\/v([a-z0-9]+\.[a-z0-9]+\.[a-z0-9]+)$/;

export function verifyGitStatus(
repositoryRoot: string,
getRepositoryStatusFn: typeof getRepositoryStatus = getRepositoryStatus
getRepositoryStatusFn: typeof getRepositoryStatus = getRepositoryStatus,
spawnSync: typeof spawnSyncFn = spawnSyncFn
): RepositoryStatus {
spawnSync('git', ['fetch', '--tags'], {
cwd: repositoryRoot,
encoding: 'utf-8'
});

const repositoryStatus = getRepositoryStatusFn(repositoryRoot);
if (!repositoryStatus.branch?.local) {
throw new Error('Could not determine local repository information - please verify your repository is intact.');
Expand Down