diff --git a/scripts/ci/funcs.sh b/scripts/ci/funcs.sh index a2b296bf..e05be3e4 100644 --- a/scripts/ci/funcs.sh +++ b/scripts/ci/funcs.sh @@ -233,6 +233,7 @@ function create_github_release_linux() local DEB_FILE="build-linux/deb/${DEB_NAME}" local APPIMAGE_FILE=$(find build-appimage -iname '*.AppImage') local EXE_FILE="$(ls win/build/*.exe 2> /dev/null | head -n 1)" + local ZIP_FILE="$(ls win/build/*.zip 2> /dev/null | head -n 1)" if [ -z "$VERSION" ]; then >&2 echo -e "Skipping GitHub release creation (current build does not have a tag)" @@ -241,9 +242,10 @@ function create_github_release_linux() >&2 echo -e "Creating (Linux) GitHub release (tag: $VERSION)" - create_release_and_upload_asset $VERSION $DEB_FILE + create_release_and_upload_asset $VERSION $DEB_FILE create_release_and_upload_asset $VERSION $APPIMAGE_FILE create_release_and_upload_asset $VERSION $EXE_FILE + create_release_and_upload_asset $VERSION $ZIP_FILE } # Create a a GitHub release for the specified version and upload all applicable assets diff --git a/scripts/ci/linux/after_success.sh b/scripts/ci/linux/after_success.sh index 37ed8c66..c880c0f0 100755 --- a/scripts/ci/linux/after_success.sh +++ b/scripts/ci/linux/after_success.sh @@ -22,14 +22,14 @@ mkdir -p $WDIR/redist #Get 3rd party tools wget_retry https://calaos.fr/mooltipass/tools/windows/mc-agent.exe -O $WDIR/mc-agent.exe wget_retry https://calaos.fr/mooltipass/tools/windows/mc-cli.exe -O $WDIR/mc-cli.exe -wget_retry https://calaos.fr/download/misc/redist/Win32OpenSSL_Light-1_0_2L.exe -O $WDIR/redist/Win32OpenSSL_Light-1_0_2L.exe -wget_retry https://calaos.fr/download/misc/redist/vcredist_sp1_x86.exe -O $WDIR/redist/vcredist_sp1_x86.exe for f in $MXE_BIN/bin/libgcc_s_sjlj-1.dll \ $MXE_BIN/bin/libstdc++-6.dll \ $MXE_BIN/bin/libwinpthread-1.dll \ $MXE_BIN/bin/libwebp-5.dll \ $MXE_BIN/bin/zlib1.dll \ + $MXE_BIN/bin/ssleay32.dll \ + $MXE_BIN/bin/libeay32.dll \ $MXE_BIN/bin/icudt56.dll \ $MXE_BIN/bin/icuin56.dll \ $MXE_BIN/bin/icuuc56.dll \ @@ -57,6 +57,15 @@ chmod +x iscc sign_binary build/$FILENAME.exe +#Create a portable zip for windows +ZIPFILE=moolticute_portable_win32_${VERSION}.zip +pushd $WDIR/.. +mv moolticute_build moolticute_$VERSION +zip --compression-method deflate -r $ZIPFILE moolticute_$VERSION +popd + +mv $WDIR/../$ZIPFILE build/ + #create update manifest cat > build/updater.json <