Testing changes suggested in PR
This commit is contained in:
parent
e6a7d25e7b
commit
691795c644
6
Makefile
6
Makefile
|
@ -432,8 +432,10 @@ endif
|
|||
ifdef WINDOWS_CODESIGN_PFX_PATH
|
||||
scripts/sign-windows-bin.sh $(INSTALLER_OUTPUT)
|
||||
endif
|
||||
|
||||
$(STATUS_CLIENT_7Z): OUTPUT := tmp/windows/dist/Status
|
||||
$(STATUS_CLIENT_7Z): $(STATUS_CLIENT_EXE)
|
||||
echo -e $(BUILD_MSG) "7z"
|
||||
rm $(OUTPUT)/status.iss
|
||||
7z a $(STATUS_CLIENT_7Z) ./$(OUTPUT)
|
||||
|
||||
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)
|
||||
|
||||
zip-windows: check-pkg-target-windows $(STATUS_CLIENT_7Z)
|
||||
|
||||
clean: | clean-common
|
||||
rm -rf bin/* node_modules bottles/* pkg/* tmp/* $(STATUSGO)
|
||||
+ $(MAKE) -C vendor/DOtherSide/build --no-print-directory clean
|
||||
|
|
|
@ -60,6 +60,7 @@ pipeline {
|
|||
stage('Package') {
|
||||
steps { script {
|
||||
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)
|
||||
exe_url = s3.uploadArtifact(env.STATUS_CLIENT_EXE)
|
||||
env.PKG_URL = exe_url
|
||||
|
||||
urls = [
|
||||
Zip: zip_url,
|
||||
Exe: exe_url,
|
||||
]
|
||||
jenkins.setBuildDesc(urls)
|
||||
jenkins.setBuildDesc(Zip: zip_url, Exe: exe_url)
|
||||
} }
|
||||
}
|
||||
stage('Archive') {
|
||||
|
|
Loading…
Reference in New Issue