Skip to content

Commit 36af4be

Browse files
siddarthkaysiddarthkay
committed
fix: CI jobs to find artefacts after repo rename
Otherwise they end up with artefacts that contain UNKOWN in the name
1 parent 20e27de commit 36af4be

12 files changed

+32
-32
lines changed

‎ci/Jenkinsfile.android‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()
@@ -16,7 +16,7 @@ pipeline {
1616
args '--entrypoint="" ' +
1717
'--volume=/nix:/nix ' +
1818
'--volume=/etc/nix:/etc/nix '
19-
customWorkspace "/home/jenkins/workspace/status-desktop-android/${env.BUILD_NUMBER}"
19+
customWorkspace "/home/jenkins/workspace/status-app-android/${env.BUILD_NUMBER}"
2020
}
2121
}
2222

@@ -49,7 +49,7 @@ pipeline {
4949
artifactNumToKeepStr: '3',
5050
))
5151
/* Allows combined build to copy */
52-
copyArtifactPermission('/status-desktop/*')
52+
copyArtifactPermission('/status-app/*')
5353
/* Abort old PR builds. */
5454
disableConcurrentBuilds(abortPrevious: isPRBuild)
5555
disableRestartFromStage()

‎ci/Jenkinsfile.combined‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env groovy
22

3-
library '[email protected].30'
3+
library '[email protected].31'
44

55
/* Object to store public URLs for description. */
66
urls = [:]
@@ -28,7 +28,7 @@ pipeline {
2828
artifactNumToKeepStr: '10',
2929
))
3030
/* Allows combined build to copy */
31-
copyArtifactPermission('/status-desktop/*')
31+
copyArtifactPermission('/status-app/*')
3232
}
3333

3434
parameters {
@@ -53,7 +53,7 @@ pipeline {
5353
steps {
5454
script {
5555
linux_x86_64 = getArtifacts(
56-
'Linux', jenkins.Build('status-desktop/systems/linux/x86_64/package')
56+
'Linux', jenkins.Build('status-app/systems/linux/x86_64/package')
5757
)
5858
}
5959
}
@@ -62,7 +62,7 @@ pipeline {
6262
steps {
6363
script {
6464
linux_e2e = build(
65-
job: 'status-desktop/systems/linux/x86_64/tests-e2e',
65+
job: 'status-app/systems/linux/x86_64/tests-e2e',
6666
parameters: jenkins.mapToParams([
6767
BUILD_SOURCE: linux_x86_64.fullProjectName,
6868
TESTRAIL_RUN_NAME: utils.pkgFilename(),
@@ -81,7 +81,7 @@ pipeline {
8181
steps {
8282
script {
8383
windows_x86_64 = getArtifacts(
84-
'Windows', jenkins.Build('status-desktop/systems/windows/x86_64/package')
84+
'Windows', jenkins.Build('status-app/systems/windows/x86_64/package')
8585
)
8686
}
8787
}
@@ -95,7 +95,7 @@ pipeline {
9595
steps {
9696
script {
9797
windows_e2e = build(
98-
job: 'status-desktop/systems/windows/x86_64/tests-e2e',
98+
job: 'status-app/systems/windows/x86_64/tests-e2e',
9999
parameters: jenkins.mapToParams([
100100
BUILD_SOURCE: windows_x86_64.fullProjectName,
101101
TESTRAIL_RUN_NAME: utils.pkgFilename(),
@@ -110,15 +110,15 @@ pipeline {
110110
}
111111
stage('MacOS/aarch64') { steps { script {
112112
macos_aarch64 = getArtifacts(
113-
'MacOS/aarch64', jenkins.Build('status-desktop/systems/macos/aarch64/package')
113+
'MacOS/aarch64', jenkins.Build('status-app/systems/macos/aarch64/package')
114114
)
115115
} } }
116116
}
117117
}
118118
stage('Publish') {
119119
when { expression { params.PUBLISH } }
120120
steps { script {
121-
github.publishReleaseFiles(repo: 'status-desktop');
121+
github.publishReleaseFiles(repo: 'status-app');
122122
} }
123123
}
124124
}
@@ -148,7 +148,7 @@ pipeline {
148148
* - A user explicitly specified a value
149149
* Since release builds create and re-create GitHub drafts every time. */
150150
def Boolean getPublishDefault(Boolean previousValue) {
151-
if (env.JOB_NAME.startsWith('status-desktop/release')) { return true }
151+
if (env.JOB_NAME.startsWith('status-app/release')) { return true }
152152
if (previousValue != null) { return previousValue }
153153
return false
154154
}

‎ci/Jenkinsfile.ios‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()
@@ -42,7 +42,7 @@ pipeline {
4242
artifactNumToKeepStr: '3',
4343
))
4444
/* Allows combined build to copy */
45-
copyArtifactPermission('/status-desktop/*')
45+
copyArtifactPermission('/status-app/*')
4646
/* Abort old PR builds. */
4747
disableConcurrentBuilds(abortPrevious: isPRBuild)
4848
disableRestartFromStage()

‎ci/Jenkinsfile.linux‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()
@@ -65,7 +65,7 @@ pipeline {
6565
artifactNumToKeepStr: '1',
6666
))
6767
/* Allows combined build to copy */
68-
copyArtifactPermission('/status-desktop/*')
68+
copyArtifactPermission('/status-app/*')
6969
/* Abort old PR builds. */
7070
disableConcurrentBuilds(
7171
abortPrevious: isPRBuild
@@ -153,7 +153,7 @@ pipeline {
153153
when { expression { utils.isPRBuild() && !(params.USE_NWAKU ?: false) } }
154154
steps { script {
155155
build(
156-
job: 'status-desktop/e2e/prs',
156+
job: 'status-app/e2e/prs',
157157
wait: false,
158158
parameters: jenkins.mapToParams([
159159
GIT_REF: env.CHANGE_BRANCH ?: env.BRANCH_NAME,

‎ci/Jenkinsfile.linux-nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env groovy
22

3-
library '[email protected].30'
3+
library '[email protected].31'
44

55
/* Options section can't access functions in objects. */
66
def isPRBuild = utils.isPRBuild()
@@ -48,7 +48,7 @@ pipeline {
4848
artifactNumToKeepStr: '1',
4949
))
5050
/* Allows combined build to copy */
51-
copyArtifactPermission('/status-desktop/*')
51+
copyArtifactPermission('/status-app/*')
5252
/* Abort old PR builds. */
5353
disableConcurrentBuilds(
5454
abortPrevious: isPRBuild

‎ci/Jenkinsfile.macos‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()
@@ -59,7 +59,7 @@ pipeline {
5959
artifactNumToKeepStr: '1',
6060
))
6161
/* Allows combined build to copy */
62-
copyArtifactPermission('/status-desktop/*')
62+
copyArtifactPermission('/status-app/*')
6363
/* Abort old PR builds. */
6464
disableConcurrentBuilds(
6565
abortPrevious: isPRBuild

‎ci/Jenkinsfile.qt-build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
pipeline {
55
agent {

‎ci/Jenkinsfile.tests-e2e‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
pipeline {
55
agent {
@@ -253,7 +253,7 @@ pipeline {
253253
def setNewBuildName() {
254254
if (currentBuild.upstreamBuilds) {
255255
def parent = utils.parentOrCurrentBuild()
256-
currentBuild.displayName = parent.getFullDisplayName().minus('status-desktop » ')
256+
currentBuild.displayName = parent.getFullDisplayName().minus('status-app » ')
257257
}
258258
}
259259

@@ -296,7 +296,7 @@ def getDefaultBuildSource() {
296296
}
297297

298298
def getDefaultTestScopeFlag() {
299-
if (JOB_NAME == "status-desktop/systems/linux/x86_64/tests-e2e") {
299+
if (JOB_NAME == "status-app/systems/linux/x86_64/tests-e2e") {
300300
return ''
301301
} else {
302302
return '-m=critical'

‎ci/Jenkinsfile.tests-e2e.windows‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
pipeline {
55

@@ -290,7 +290,7 @@ def getDefaultBuildSource() {
290290
}
291291

292292
def getDefaultTestScopeFlag() {
293-
if (JOB_NAME == "status-desktop/systems/windows/x86_64/tests-e2e") {
293+
if (JOB_NAME == "status-app/systems/windows/x86_64/tests-e2e") {
294294
return ''
295295
} else {
296296
return '-m=critical'

‎ci/Jenkinsfile.tests-nim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env groovy
2-
library '[email protected].30'
2+
library '[email protected].31'
33

44
/* Options section can't access functions in objects. */
55
def isPRBuild = utils.isPRBuild()

0 commit comments

Comments
 (0)