Skip to content

Commit

Permalink
ci: move proxy stage setup to jenkins-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
yakimant committed Aug 28, 2024
1 parent 2cf9cd6 commit 9c48906
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion ci/Jenkinsfile.combined
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Object to store public URLs for description. */
urls = [:]
Expand Down
3 changes: 1 addition & 2 deletions ci/Jenkinsfile.linux
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down Expand Up @@ -74,7 +74,6 @@ pipeline {
/* Control output the filename */
STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename(ext: 'AppImage', arch: getArch())}"
STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'tar.gz', arch: getArch())}"
STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
}

stages {
Expand Down
3 changes: 1 addition & 2 deletions ci/Jenkinsfile.linux-nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down Expand Up @@ -63,7 +63,6 @@ pipeline {
/* Control output the filename */
STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename(ext: 'nix.AppImage', arch: getArch())}"
STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'nix.tar.gz', arch: getArch())}"
STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
}

stages {
Expand Down
3 changes: 1 addition & 2 deletions ci/Jenkinsfile.macos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down Expand Up @@ -75,7 +75,6 @@ pipeline {
STATUS_CLIENT_DMG = "pkg/${utils.pkgFilename(ext: 'dmg', arch: getArch())}"
/* Apple Team ID for Notarization */
MACOS_NOTARIZE_TEAM_ID = "8B5X2M6H2Y"
STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
}

stages {
Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfile.tests-e2e
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

pipeline {

Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfile.tests-nim
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down
2 changes: 1 addition & 1 deletion ci/Jenkinsfile.tests-ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down
3 changes: 1 addition & 2 deletions ci/Jenkinsfile.windows
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down Expand Up @@ -77,7 +77,6 @@ pipeline {
STATUS_CLIENT_EXE = "pkg/${utils.pkgFilename(ext: 'exe', arch: getArch())}"
/* 7zip archive filename */
STATUS_CLIENT_7Z = "pkg/${utils.pkgFilename(ext: '7z', arch: getArch())}"
STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
/* Hack-fix for params not being set in env on first job run. */
WINDOWS_CODESIGN_TIMESTAMP_URL = "${params.WINDOWS_CODESIGN_TIMESTAMP_URL}"
}
Expand Down
2 changes: 1 addition & 1 deletion ci/cpp/Jenkinsfile.linux
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down
2 changes: 1 addition & 1 deletion ci/cpp/Jenkinsfile.macos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

/* Options section can't access functions in objects. */
def isPRBuild = utils.isPRBuild()
Expand Down
2 changes: 1 addition & 1 deletion ci/cpp/Jenkinsfile.windows
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env groovy
library 'status-jenkins-lib@v1.9.6'
library 'status-jenkins-lib@v1.9.7'

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

0 comments on commit 9c48906

Please sign in to comment.