Permalink
Browse files

adapt build to do not sign Windows build but get pre-signed 70 vm

  • Loading branch information...
demarey committed Jan 22, 2019
1 parent 1484832 commit 85bebb7dc75e7e78fac0f2cb02fde3ec384edbf0
Showing with 9 additions and 7 deletions.
  1. +4 −3 Jenkinsfile
  2. +5 −4 build.sh
@@ -55,13 +55,14 @@ def buildArchitecture(architecture, pharoVersion) {
stage("Packaging-Windows Pharo${pharoVersion}-${architecture}-bits") {
deleteDir()
unstash "pharo-launcher-one-${architecture}"
if ( isPullRequest() ) { // Do not give access to certificates and do not sign
// Disable signing for now because the signing process now requires manual action
/* if ( isPullRequest() ) { // Do not give access to certificates and do not sign
bat "bash -c \"VERSION=$version ./build.sh win-package\""
} else {
} else { */
withCredentials([usernamePassword(credentialsId: 'inriasoft-windows-developper', passwordVariable: 'PHARO_CERT_PASSWORD', usernameVariable: 'PHARO_SIGN_IDENTITY')]) {
bat "bash -c \"VERSION=$version SHOULD_SIGN=true ./build.sh win-package\""
}
}
// }
archiveArtifacts artifacts: 'pharo-launcher-*.msi', fingerprint: true
stash includes: 'pharo-launcher-*.msi', name: "pharo-launcher-win-${architecture}-package"
}
@@ -22,7 +22,8 @@ function prepare_image() {
exit 1
;;
esac
wget --quiet -O - get.pharo.org/$ARCH_PATH$PHARO+$VM | bash
wget --quiet -O - get.pharo.org/$ARCH_PATH$PHARO | bash
wget --quiet -O - get.pharo.org/$ARCH_PATH$VM$PHARO | bash

./pharo Pharo.image save PharoLauncher --delete-old
./pharo PharoLauncher.image --version > version.txt
@@ -40,8 +41,8 @@ function package_user_version() {
LAUNCHER_VERSION=$(eval 'git describe --tags --always')
./pharo PharoLauncher.image eval --save "PhLAboutCommand version: '$LAUNCHER_VERSION'"

# Faster the startup of the launcher image
./pharo PharoLauncher.image eval --save ""
# Avoid to have PL core dir set to the slave location
./pharo PharoLauncher.image eval --save "PhLTemplateSources classVarNamed: 'LauncherCoreDir' put: nil"

# Create the platform-specific archives
mkdir One
@@ -160,7 +161,7 @@ function get_pharo_sources_version() {
}

PHARO=${PHARO:=61} # If PHARO not set, set it to 61.
VM=${VM:=vm} # If VM not set, set it to vm.
VM=${VM:=signedVm} # If VM not set, set it to signedVm.
ARCHITECTURE=${ARCHITECTURE:-'32'} # If ARCH not set, set it to 32 bits

SCRIPT_TARGET=${1:-all}

0 comments on commit 85bebb7

Please sign in to comment.