Skip to content

Commit aef45ce

Browse files
committed
Доработки Jenkinsfile
1 parent 62779eb commit aef45ce

File tree

1 file changed

+43
-5
lines changed

1 file changed

+43
-5
lines changed

Jenkinsfile

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ pipeline {
55

66
environment {
77
VersionPrefix = '2.0.0'
8-
VersionSuffix = 'rc.11'+"+${BUILD_NUMBER}"
98
outputEnc = '65001'
109
}
1110

@@ -240,6 +239,29 @@ pipeline {
240239
}
241240
}
242241

242+
stage ('Publishing latest') {
243+
when {
244+
anyOf {
245+
branch 'release/latest';
246+
}
247+
}
248+
agent { label 'master' }
249+
options { skipDefaultCheckout() }
250+
251+
steps {
252+
cleanWs()
253+
checkout scm // чтобы получить файл release-notes
254+
unstash 'dist'
255+
unstash 'vsix'
256+
257+
// Положит описание для сайта
258+
publishReleaseNotes('latest')
259+
260+
// Положит файлы дистрибутива в целевую папку
261+
publishRelease('latest', true)
262+
}
263+
}
264+
243265
stage ('Publishing artifacts to clouds') {
244266
when {
245267
anyOf {
@@ -266,15 +288,15 @@ pipeline {
266288
agent { label 'linux' }
267289
when {
268290
anyOf {
269-
branch 'release/latest'
291+
branch 'release/lts'
270292
expression {
271293
return env.TAG_NAME && env.TAG_NAME.startsWith('v1.')
272294
}
273295
}
274296
}
275297
steps {
276298
script {
277-
def codename = env.TAG_NAME ? env.TAG_NAME : 'latest'
299+
def codename = env.TAG_NAME ? env.TAG_NAME : 'lts'
278300
publishDockerImage('v1', codename)
279301
}
280302
}
@@ -285,6 +307,7 @@ pipeline {
285307
when {
286308
anyOf {
287309
branch 'develop'
310+
branch 'release/latest'
288311
expression {
289312
return env.TAG_NAME && env.TAG_NAME.startsWith('v2.')
290313
}
@@ -302,6 +325,20 @@ pipeline {
302325
}
303326
}
304327

328+
def fullVersionNumber() {
329+
def version = env.VersionPrefix
330+
if (env.VersionSuffix != null && !env.VersionSuffix.isEmpty())
331+
{
332+
version = version + "-${env.VersionSuffix}"
333+
}
334+
335+
return version
336+
}
337+
338+
def underscoredVersion() {
339+
return fullVersionNumber().replaceAll("\\.", "_")
340+
}
341+
305342
def publishRelease(codename, isNumbered) {
306343
dir('targetContent') {
307344
sh """
@@ -317,7 +354,8 @@ def publishRelease(codename, isNumbered) {
317354
""".stripIndent()
318355

319356
if (isNumbered) {
320-
def version="${env.VersionPrefix}-${env.VersionSuffix}".replaceAll("\\.", "_")
357+
358+
def version = underscoredVersion()
321359

322360
sh """
323361
TARGET="/var/www/oscript.io/download/versions/${version}/"
@@ -330,7 +368,7 @@ def publishRelease(codename, isNumbered) {
330368

331369
def publishReleaseNotes(codename) {
332370
dir('markdownContent') {
333-
def version="${env.VersionPrefix}-${env.VersionSuffix}".replaceAll("\\.", "_")
371+
def version=underscoredVersion()
334372
def targetDir='/var/www/oscript.io/markdown/versions'
335373

336374
sh """

0 commit comments

Comments
 (0)