Skip to content

Commit 40f93ba

Browse files
committed
#1346 Try osx/ARM again
1 parent 3c24b22 commit 40f93ba

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

Jenkinsfile

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,22 @@ pipeline {
5858
sh 'rm -Rf _ ship'
5959
}
6060
}
61-
//AWS stage ('Mac Build and Packaging (ARM)') {
62-
//AWS agent {
63-
//AWS label 'mac && arm && build && ride'
64-
//AWS }
65-
//AWS steps {
66-
//AWS sh 'rm -Rf _ ship'
67-
//AWS sh 'npm i'
68-
//AWS sh 'npm run build oa'
69-
//AWS withCredentials([usernamePassword(credentialsId: '868dda6c-aaec-4ee4-845a-57362dec695b', passwordVariable: 'APPLE_APP_PASS', usernameVariable: 'APPLE_ID')]) {
70-
//AWS sh './CI/packagescripts/osx/packageOSX.sh'
71-
//AWS }
72-
//AWS stash name: 'ride-macarm', includes: '_/ride*/Ride-*-darwin*/**'
73-
//AWS stash name: 'macarm-ship', includes: 'ship/*'
74-
//AWS sh 'rm -Rf _ ship'
75-
//AWS }
76-
//AWS }
61+
stage ('Mac Build and Packaging (ARM)') {
62+
agent {
63+
label 'mac && arm && build && ride'
64+
}
65+
steps {
66+
sh 'rm -Rf _ ship'
67+
sh 'npm i'
68+
sh 'npm run build oa'
69+
withCredentials([usernamePassword(credentialsId: '868dda6c-aaec-4ee4-845a-57362dec695b', passwordVariable: 'APPLE_APP_PASS', usernameVariable: 'APPLE_ID')]) {
70+
sh './CI/packagescripts/osx/packageOSX.sh'
71+
}
72+
stash name: 'ride-macarm', includes: '_/ride*/Ride-*-darwin*/**'
73+
stash name: 'macarm-ship', includes: 'ship/*'
74+
sh 'rm -Rf _ ship'
75+
}
76+
}
7777
stage ('Windows Packaging') {
7878
agent {
7979
label 'win && ride'
@@ -105,7 +105,7 @@ pipeline {
105105
sh 'rm -Rf _'
106106
unstash 'ride-version'
107107
unstash 'mac-ship'
108-
//AWS unstash 'macarm-ship'
108+
unstash 'macarm-ship'
109109
withCredentials([usernamePassword(credentialsId: '868dda6c-aaec-4ee4-845a-57362dec695b', passwordVariable: 'APPLE_APP_PASS', usernameVariable: 'APPLE_ID')]) {
110110
sh "CI/packagescripts/osx/notarise.sh"
111111
}
@@ -129,7 +129,7 @@ pipeline {
129129
sh 'rm -Rf _ ship'
130130
unstash 'ride-win'
131131
unstash 'ride-mac'
132-
//AWS unstash 'ride-macarm'
132+
unstash 'ride-macarm'
133133
unstash 'ride-linux'
134134
unstash 'ride-version'
135135
unstash 'linux-ship'

0 commit comments

Comments
 (0)