From 3a71daa74069aaa63240c64f3ab8798d9153d722 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Mon, 31 Jul 2023 14:21:27 +0200 Subject: [PATCH] Fixes pipelines --- .azure-pipelines/publish-nightly.yml | 6 ++++-- .azure-pipelines/publish-stable.yml | 3 +++ scripts/lib/index.ts | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/publish-nightly.yml b/.azure-pipelines/publish-nightly.yml index 344bbdfdb8..d4358ce800 100644 --- a/.azure-pipelines/publish-nightly.yml +++ b/.azure-pipelines/publish-nightly.yml @@ -28,10 +28,12 @@ parameters: displayName: The VS Code commit id. When left empty, the main branched is used. type: string default: '' + required: false - name: prereleaseVersion displayName: The prerelease version. When left empty, dev-${today} is used. type: string default: '' + required: false extends: template: azure-pipelines/npm-package/pipeline.yml@templates @@ -41,8 +43,8 @@ extends: workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core testPlatforms: [] buildSteps: - - name: Install libkrb5-dev - run: sudo apt install -y libkrb5-dev + - script: sudo apt install -y libkrb5-dev + displayName: Install libkrb5-dev - script: npm ci displayName: Install NPM dependencies diff --git a/.azure-pipelines/publish-stable.yml b/.azure-pipelines/publish-stable.yml index cd48b33307..f2aac0555d 100644 --- a/.azure-pipelines/publish-stable.yml +++ b/.azure-pipelines/publish-stable.yml @@ -37,6 +37,9 @@ extends: workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core testPlatforms: [] buildSteps: + - script: sudo apt install -y libkrb5-dev + displayName: Install libkrb5-dev + - script: npm ci displayName: Install NPM dependencies diff --git a/scripts/lib/index.ts b/scripts/lib/index.ts index a8eca48db3..d03deceaa3 100644 --- a/scripts/lib/index.ts +++ b/scripts/lib/index.ts @@ -81,7 +81,9 @@ export function getNightlyVersion(version: string, prerelease: string | undefine const mm = String(date.getUTCMonth() + 1).padStart(2, '0'); const dd = String(date.getUTCDate()).padStart(2, '0'); - prerelease = prerelease || `dev.${yyyy}${mm}${dd}`; + prerelease = prerelease || "dev-${today}"; + prerelease = prerelease.replace("${today}", `${yyyy}${mm}${dd}`); + return `0.${minor + 1}.0-${prerelease}`; }