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

Testing changes suggested in PR

This commit is contained in:
Andrei Smirnov 2021-09-15 17:08:13 +03:00 committed by Iuri Matias
parent e6a7d25e7b
commit 691795c644
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -432,8 +432,10 @@ endif
ifdef WINDOWS_CODESIGN_PFX_PATH ifdef WINDOWS_CODESIGN_PFX_PATH
scripts/sign-windows-bin.sh $(INSTALLER_OUTPUT) scripts/sign-windows-bin.sh $(INSTALLER_OUTPUT)
endif endif
$(STATUS_CLIENT_7Z): OUTPUT := tmp/windows/dist/Status
$(STATUS_CLIENT_7Z): $(STATUS_CLIENT_EXE)
echo -e $(BUILD_MSG) "7z" echo -e $(BUILD_MSG) "7z"
rm $(OUTPUT)/status.iss
7z a $(STATUS_CLIENT_7Z) ./$(OUTPUT) 7z a $(STATUS_CLIENT_7Z) ./$(OUTPUT)
pkg: $(PKG_TARGET) pkg: $(PKG_TARGET)
@ -446,6 +448,8 @@ pkg-macos: check-pkg-target-macos $(STATUS_CLIENT_DMG)
pkg-windows: check-pkg-target-windows $(STATUS_CLIENT_EXE) pkg-windows: check-pkg-target-windows $(STATUS_CLIENT_EXE)
zip-windows: check-pkg-target-windows $(STATUS_CLIENT_7Z)
clean: | clean-common clean: | clean-common
rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO) rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO)
+ $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean + $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean

8
ci/Jenkinsfile.windows
View File

@ -60,6 +60,7 @@ pipeline {
stage('Package') { stage('Package') {
steps { script { steps { script {
windows.bundle(env.STATUS_CLIENT_EXE) windows.bundle(env.STATUS_CLIENT_EXE)
windows.bundle(env.STATUS_CLIENT_7Z)
} } } }
} }
@ -70,12 +71,7 @@ pipeline {
zip_url = s3.uploadArtifact(env.STATUS_CLIENT_7Z) zip_url = s3.uploadArtifact(env.STATUS_CLIENT_7Z)
exe_url = s3.uploadArtifact(env.STATUS_CLIENT_EXE) exe_url = s3.uploadArtifact(env.STATUS_CLIENT_EXE)
env.PKG_URL = exe_url env.PKG_URL = exe_url
jenkins.setBuildDesc(Zip: zip_url, Exe: exe_url)
urls = [
Zip: zip_url,
Exe: exe_url,
]
jenkins.setBuildDesc(urls)
} } } }
} }
stage('Archive') { stage('Archive') {