Skip to content

Commit 9427ef8

Browse files
committed
ci(nightly): use semver
1 parent ddfbc83 commit 9427ef8

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
4444
const currentVersion = packageJson.version;
4545
46-
const timestamp = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 14);
47-
const nightlyVersion = `${currentVersion}+${timestamp}`;
46+
const timestamp = new Date().toISOString().replace(/[-:T]/g, '').slice(2, 12);
47+
const nightlyVersion = `${currentVersion}-nightly.${timestamp}`;
4848
4949
return nightlyVersion;
5050

scripts/bundle.msix.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ async function getArgs() {
1818
};
1919
}
2020

21-
const [major, minor, patch, nightly_date] = packageJson.version.split(/[\.\+]/);
21+
const [major, minor, patch, pre, _build_number] = packageJson.version.split(/[\.\+\-]/);
2222
if (major === undefined || minor === undefined || patch === undefined) {
2323
throw new Error("Invalid package version");
2424
}
@@ -42,10 +42,8 @@ fs.mkdirSync(bundleFolder, { recursive: true });
4242

4343
// we skip revision here because greater numbers than 65535 are not supported on msix
4444
const appxPackageVersion = `${major}.${minor}.${patch}.0`;
45-
const fileVersion = nightly_date ? packageJson.version : appxPackageVersion;
46-
const installer_msix_path = path.resolve(
47-
`${bundleFolder}/Seelen.SeelenUI_${fileVersion}_${arch}__p6yyn03m1894e.msix`,
48-
);
45+
const fileVersion = pre ? packageJson.version : appxPackageVersion;
46+
const installer_msix_path = path.resolve(`${bundleFolder}/Seelen.UI_${fileVersion}_${arch}.msix`);
4947

5048
// Add manifest
5149
const manifest = fs

0 commit comments

Comments
 (0)