diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ea5b6a97dd..210945d4d16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: steps: - name: Compute app version run: | - VERSION="0.0.0" + VERSION="1.2.3.4" if [[ "$GITHUB_REF" =~ ^refs/tags/ ]]; then # 'refs/tags/v1.2.3' -> '1.2.3' VERSION=$(echo "${GITHUB_REF/refs\/tags\//}" | sed -E "s/v(.*)/\\1/") diff --git a/script/package.ts b/script/package.ts index f1b10ad9a3a..4dc86e22901 100644 --- a/script/package.ts +++ b/script/package.ts @@ -24,6 +24,7 @@ import { getDistArchitecture, } from './dist-info' import { isGitHubActions } from './build-platforms' +import * as fs from 'fs' import { existsSync, rmSync, writeFileSync } from 'fs' import { getVersion } from '../app/package-info' import { rename } from 'fs/promises' @@ -165,6 +166,11 @@ function packageWindows() { `${getWindowsIdentifierName()}-${getVersion()}-${arch}-${kind}.nupkg` ) + console.log('Files in output directory:') + const files = await fs.promises.readdir(outputDir) + for (const file of files) { + console.log(` - ${file}`) + } console.log(`Renaming ${from} to ${to}`) await rename(from, to) } @@ -253,7 +259,8 @@ function getSemverCompatibleVersion() { const major = parts[0] const minor = parts[1] const patch = parts[2] - return `${major}.${minor}.${patch}-${version}` + const rest = parts.slice(3).join('-') + return `${major}.${minor}.${patch}-r${rest}` } return version }