MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-28 05:55:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(release): prefix git hash in nightly versions to prevent semver normalization (#25304)

Browse Source
This commit is contained in:
Sandy Tao
2026-04-13 10:55:11 -07:00
committed by GitHub
parent a5f7b453ca
commit 36dca862cc
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/get-release-version.js
+2 -2
View File
@@ -285,7 +285,7 @@ function promoteNightlyVersion({ args } = {}) {
const date = new Date().toISOString().slice(0, 10).replace(/-/g, ''); const date = new Date().toISOString().slice(0, 10).replace(/-/g, '');
const gitShortHash = execSync('git rev-parse --short HEAD').toString().trim(); const gitShortHash = execSync('git rev-parse --short HEAD').toString().trim();
return { return {
releaseVersion: `${major}.${nextMinor}.0-nightly.${date}.${gitShortHash}`, releaseVersion: `${major}.${nextMinor}.0-nightly.${date}.g${gitShortHash}`,
npmTag: TAG_NIGHTLY, npmTag: TAG_NIGHTLY,
previousReleaseTag: previousNightlyTag, previousReleaseTag: previousNightlyTag,
}; };
@@ -296,7 +296,7 @@ function getNightlyVersion() {
const baseVersion = packageJson.version.split('-')[0]; const baseVersion = packageJson.version.split('-')[0];
const date = new Date().toISOString().slice(0, 10).replace(/-/g, ''); const date = new Date().toISOString().slice(0, 10).replace(/-/g, '');
const gitShortHash = execSync('git rev-parse --short HEAD').toString().trim(); const gitShortHash = execSync('git rev-parse --short HEAD').toString().trim();
const releaseVersion = `${baseVersion}-nightly.${date}.${gitShortHash}`; const releaseVersion = `${baseVersion}-nightly.${date}.g${gitShortHash}`;
const previousReleaseTag = getLatestTag('v*-nightly*'); const previousReleaseTag = getLatestTag('v*-nightly*');
return { return {
scripts/tests/get-release-version.test.js
+15 -1
View File
@@ -93,7 +93,7 @@ describe('getVersion', () => {
vi.mocked(execSync).mockImplementation(mockExecSync); vi.mocked(execSync).mockImplementation(mockExecSync);
const result = getVersion({ type: 'nightly' }); const result = getVersion({ type: 'nightly' });
// Note: The base version now comes from package.json, not the previous nightly tag. // Note: The base version now comes from package.json, not the previous nightly tag.
expect(result.releaseVersion).toBe('0.8.0-nightly.20250917.d3bf8a3d'); expect(result.releaseVersion).toBe('0.8.0-nightly.20250917.gd3bf8a3d');
expect(result.npmTag).toBe('nightly'); expect(result.npmTag).toBe('nightly');
expect(result.previousReleaseTag).toBe('v0.8.0-nightly.20250916.abcdef'); expect(result.previousReleaseTag).toBe('v0.8.0-nightly.20250916.abcdef');
}); });
@@ -191,5 +191,19 @@ describe('getVersion', () => {
// Should have skipped preview.0 and landed on preview.1 // Should have skipped preview.0 and landed on preview.1
expect(result.releaseVersion).toBe('0.8.0-preview.1'); expect(result.releaseVersion).toBe('0.8.0-preview.1');
}); });
it('should preserve a git hash with a leading zero via the g prefix', () => {
const mockWithLeadingZeroHash = (command) => {
// Return an all-numeric hash with a leading zero
if (command.includes('git rev-parse --short HEAD')) return '017972622';
return mockExecSync(command);
};
vi.mocked(execSync).mockImplementation(mockWithLeadingZeroHash);
const result = getVersion({ type: 'nightly' });
// The 'g' prefix forces semver to treat this as an alphanumeric
// identifier, preventing it from stripping the leading zero.
expect(result.releaseVersion).toBe('0.8.0-nightly.20250917.g017972622');
});
}); });
}); });