status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

re-enable desktop builds 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2019-09-17 10:49:00 +03:00
parent 0796f597f0
commit 00de482767
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ci/Jenkinsfile.combined
View File

@ -27,15 +27,15 @@ pipeline {
} }
stage('Build') { stage('Build') {
parallel { parallel {
//stage('MacOS') { steps { script { stage('MacOS') { steps { script {
// osx = cmn.ci.Build('status-react/combined/desktop-macos') osx = cmn.ci.Build('status-react/combined/desktop-macos')
//} } } } } }
//stage('Linux') { steps { script { stage('Linux') { steps { script {
// nix = cmn.ci.Build('status-react/combined/desktop-linux') nix = cmn.ci.Build('status-react/combined/desktop-linux')
//} } } } } }
//stage('Windows') { steps { script { stage('Windows') { steps { script {
// win = cmn.ci.Build('status-react/combined/desktop-windows') win = cmn.ci.Build('status-react/combined/desktop-windows')
//} } } } } }
//stage('iOS e2e') { steps { script { //stage('iOS e2e') { steps { script {
// iose2e = cmn.ci.Build('status-react/combined/mobile-ios-e2e') // iose2e = cmn.ci.Build('status-react/combined/mobile-ios-e2e')
//} } } //} } }
@ -53,11 +53,11 @@ pipeline {
stage('Archive') { stage('Archive') {
steps { script { steps { script {
sh('rm -f pkg/*') sh('rm -f pkg/*')
//if (btype != 'release') { if (btype != 'release') {
// cmn.ci.copyArts(osx) cmn.ci.copyArts(osx)
// cmn.ci.copyArts(nix) cmn.ci.copyArts(nix)
// cmn.ci.copyArts(win) cmn.ci.copyArts(win)
//} }
cmn.ci.copyArts(ios) cmn.ci.copyArts(ios)
//cmn.ci.copyArts(iose2e) //cmn.ci.copyArts(iose2e)
cmn.ci.copyArts(apk) cmn.ci.copyArts(apk)
@ -78,7 +78,7 @@ pipeline {
iOS: cmn.pkgUrl(ios), /*iOSe2e: cmn.pkgUrl(iose2e),*/ iOS: cmn.pkgUrl(ios), /*iOSe2e: cmn.pkgUrl(iose2e),*/
Diawi: cmn.utils.getEnv(ios, 'DIAWI_URL'), Diawi: cmn.utils.getEnv(ios, 'DIAWI_URL'),
/* desktop */ /* desktop */
//App: cmn.pkgUrl(nix), Mac: cmn.pkgUrl(osx), Win: cmn.pkgUrl(win), App: cmn.pkgUrl(nix), Mac: cmn.pkgUrl(osx), Win: cmn.pkgUrl(win),
/* upload the sha256 checksums file too */ /* upload the sha256 checksums file too */
SHA: cmn.utils.uploadArtifact(cmn.utils.pkgFind('sha256')), SHA: cmn.utils.uploadArtifact(cmn.utils.pkgFind('sha256')),
] ]

3
deployment/windows/nsis/setup.nsi
View File

@ -635,9 +635,6 @@ Section "Status Desktop" SecMain
SetOutPath "$INSTDIR\assets\resources\fonts" SetOutPath "$INSTDIR\assets\resources\fonts"
File /r "${top_srcdir}\resources\fonts\" File /r "${top_srcdir}\resources\fonts\"
SetOutPath "$INSTDIR\assets\resources\icons"
File /r "${top_srcdir}\resources\icons\"
SetOutPath "$INSTDIR\assets\resources\images" SetOutPath "$INSTDIR\assets\resources\images"
File /r "${top_srcdir}\resources\images\" File /r "${top_srcdir}\resources\images\"

2
react-native/src/desktop/status_im/react_native/js_dependencies.cljs
View File

@ -35,3 +35,5 @@
(def react-native-shake #js {}) (def react-native-shake #js {})
(def net-info #js {:default #js {}}) (def net-info #js {:default #js {}})
(def react-native-mail #js {:mail (fn [])}) (def react-native-mail #js {:mail (fn [])})
(def async-storage #js {})
(def back-handler #js {})