From de4033ae7a06d03fba6133bd90324ecc5af8ebe3 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 7 Mar 2024 00:47:15 -0300
Subject: [PATCH] Debugging msys bundler.

---
 .github/workflows/publish.yml | 49 ++++++++++++++++++-------------------------------
 win/bundle.common             | 13 +++++++++----
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5948f8d..ad4687e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -27,16 +27,26 @@ jobs:
           repository: "PerryWerneck/libv3270"
           latest: true
           fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst"      
+      - uses: robinraju/release-downloader@v1.7
+        with:
+          repository: PerryWerneck/libipc3270
+          latest: true
+          fileName: mingw-w64-x86_64-libipc3270-5.5-0-x86_64.pkg.tar.zst
+      - uses: robinraju/release-downloader@v1.7
+        with:
+          repository: PerryWerneck/libhllapi
+          latest: true
+          fileName: mingw-w64-x86_64-libhllapi-5.5-0-x86_64.pkg.tar.zst
+      - uses: robinraju/release-downloader@v1.7
+        with:
+          repository: PerryWerneck/pw3270-plugin-ipc
+          latest: true
+          fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst
       - name: MakePackage
         run: |
           pacman -U --noconfirm *.pkg.tar.zst
           dos2unix PKGBUILD.mingw
           makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw
-      - name: MakeNSIS
-        run: |
-          ./win/bundle.msys --nsi
-          mv .bin/bundle/mingw64/bin/*.exe .
-          find . -iname '*.exe'
       - uses: oprypin/find-latest-tag@v1
         id: gettag
         with:
@@ -53,24 +63,11 @@ jobs:
           omitBody: true
           omitPrereleaseDuringUpdate: true
           replacesArtifacts: true
-      - uses: robinraju/release-downloader@v1.7
-        with:
-          repository: PerryWerneck/libipc3270
-          latest: true
-          fileName: mingw-w64-x86_64-libipc3270-5.5-0-x86_64.pkg.tar.zst
-      - uses: robinraju/release-downloader@v1.7
-        with:
-          repository: PerryWerneck/libhllapi
-          latest: true
-          fileName: mingw-w64-x86_64-libhllapi-5.5-0-x86_64.pkg.tar.zst
-      - uses: robinraju/release-downloader@v1.7
-        with:
-          repository: PerryWerneck/pw3270-plugin-ipc
-          latest: true
-          fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst
       - name: Make bundle
         run: |
-          ./win/bundle.msys
+          ./win/bundle.msys --nsi --zip
+          find . -iname '*.exe'
+          find . -iname '*.zip'
           rm -f *plugin*
           tar -C ./.bin/bundle -Jcf mingw-w64-x86_64-pw3270-bundle-x86_64.tar.xz .
       - uses: ncipollo/release-action@v1
@@ -83,16 +80,6 @@ jobs:
           omitBody: true
           omitPrereleaseDuringUpdate: true
           replacesArtifacts: true
-      - uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ steps.gettag.outputs.tag }}
-          artifacts: "pw3270*.exe"
-          allowUpdates: true
-          draft: true
-          makeLatest: true
-          omitBody: true
-          omitPrereleaseDuringUpdate: true
-          replacesArtifacts: true
   macos-publish:
     runs-on: macos-latest
     steps:
diff --git a/win/bundle.common b/win/bundle.common
index 074264c..86ccd2e 100644
--- a/win/bundle.common
+++ b/win/bundle.common
@@ -389,12 +389,21 @@ build_package() {
 
 make_packages() {
 
+	echo "----------------------------------"
+	find ${srcdir} -iname *.nsi
+	echo "----------------------------------"
+	
 	if [ -e "${srcdir}/win/${PACKAGE_NAME}.nsi" ]; then
 		mkdir -p "${buildroot}${MINGW_PREFIX}/nsi"
 		cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi" 
 		if [ "$?" != "0" ]; then
 			echo "Cant copy nsis script"
 		fi	
+
+		argument "nsi" > /dev/null
+		if [ "$?" == "0" ]; then
+			make_nsis
+		fi	
 	fi
 	
 	argument "zip" > /dev/null
@@ -402,10 +411,6 @@ make_packages() {
 		make_zip
 	fi	
 
-	argument "nsi" > /dev/null
-	if [ "$?" == "0" ]; then
-		make_nsis
-	fi	
 
 }
 
--
libgit2 0.21.2