Henning Dieterichs 1 rok pred
rodič
commit
3a71daa740

+ 4 - 2
.azure-pipelines/publish-nightly.yml

@@ -28,10 +28,12 @@ parameters:
     displayName: The VS Code commit id. When left empty, the main branched is used.
     displayName: The VS Code commit id. When left empty, the main branched is used.
     type: string
     type: string
     default: ''
     default: ''
+    required: false
   - name: prereleaseVersion
   - name: prereleaseVersion
     displayName: The prerelease version. When left empty, dev-${today} is used.
     displayName: The prerelease version. When left empty, dev-${today} is used.
     type: string
     type: string
     default: ''
     default: ''
+    required: false
 
 
 extends:
 extends:
   template: azure-pipelines/npm-package/pipeline.yml@templates
   template: azure-pipelines/npm-package/pipeline.yml@templates
@@ -41,8 +43,8 @@ extends:
         workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core
         workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core
         testPlatforms: []
         testPlatforms: []
         buildSteps:
         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
           - script: npm ci
             displayName: Install NPM dependencies
             displayName: Install NPM dependencies

+ 3 - 0
.azure-pipelines/publish-stable.yml

@@ -37,6 +37,9 @@ extends:
         workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core
         workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core
         testPlatforms: []
         testPlatforms: []
         buildSteps:
         buildSteps:
+          - script: sudo apt install -y libkrb5-dev
+            displayName: Install libkrb5-dev
+
           - script: npm ci
           - script: npm ci
             displayName: Install NPM dependencies
             displayName: Install NPM dependencies
 
 

+ 3 - 1
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 mm = String(date.getUTCMonth() + 1).padStart(2, '0');
 	const dd = String(date.getUTCDate()).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}`;
 	return `0.${minor + 1}.0-${prerelease}`;
 }
 }