Merge pull request #931 from BlockSettle/fix_osx_jenkins

sergey-chernikov · web-flow · commit 0ba354aa1a88 · 2020-11-11T13:41:58.000+03:00
Fix OSX jenkins build
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -26,8 +26,8 @@ pipeline {
                 stage('Build MacOSX app') {
                     steps {
                         sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
-                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${TAG} git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common ; git submodule init ; git submodule update"'
-                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh -production"'
+                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${TAG} https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common ; git submodule init ; git submodule update"'
+                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh -production"'
                         sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
                     }
                 }
diff --git a/Jenkinsfile2 b/Jenkinsfile2
@@ -39,8 +39,8 @@ pipeline {
                     }
                     steps {
                         sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
-                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${BRANCH} git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git submodule init ; git submodule update"'
-                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
+                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${BRANCH} https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git submodule init ; git submodule update"'
+                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
                         sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
                     }
                 }
diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly
@@ -39,8 +39,8 @@ pipeline {
                     }
                     steps {
                         sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
-                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "mkdir -p ~/Workspace; cd ~/Workspace ; git clone --single-branch --branch bs_dev git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git checkout bs_dev ; git pull ; git submodule init ; git submodule update"'
-                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
+                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "mkdir -p ~/Workspace; cd ~/Workspace ; git clone --single-branch --branch bs_dev https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git checkout bs_dev ; git pull ; git submodule init ; git submodule update"'
+                        sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
                         sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ pipeline {`
`26`	`26`	`stage('Build MacOSX app') {`
`27`	`27`	`steps {`
`28`	`28`	`sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'`
`29`		`- sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${TAG} git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common ; git submodule init ; git submodule update"'`
`30`		`- sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh -production"'`
	`29`	`+ sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${TAG} https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common ; git submodule init ; git submodule update"'`
	`30`	`+ sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh -production"'`
`31`	`31`	`sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ pipeline {`
`39`	`39`	`}`
`40`	`40`	`steps {`
`41`	`41`	`sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'`
`42`		`- sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${BRANCH} git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git submodule init ; git submodule update"'`
`43`		`- sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'`
	`42`	`+ sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${BRANCH} https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git submodule init ; git submodule update"'`
	`43`	`+ sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'`
`44`	`44`	`sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"`
`45`	`45`	`}`
`46`	`46`	`}`