From 4ffe1ac96654b011279dd342400d3b6dcffd1eb1 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Thu, 30 Mar 2023 21:44:26 -0300
Subject: [PATCH] Updating win32 artifact names.

---
 .github/workflows/winpkg.yml | 12 ++++++------
 win/ci-build.sh              |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/winpkg.yml b/.github/workflows/winpkg.yml
index c5bde01..356e87e 100644
--- a/.github/workflows/winpkg.yml
+++ b/.github/workflows/winpkg.yml
@@ -33,12 +33,12 @@ jobs:
         with:
           repository: PerryWerneck/lib3270
           latest: true
-          fileName: mingw-lib3270.x86_64.tar.xz
+          fileName: mingw-w64-x86_64-lib3270.tar.xz
       - uses: robinraju/release-downloader@v1.7
         with:
           repository: PerryWerneck/libv3270
           latest: true
-          fileName: mingw-libv3270.tar.xz
+          fileName: mingw-w64-x86_64-libv3270.tar.xz
       - name: BuildApp
         run: ./win/ci-build.sh
       - name: Install pw3270
@@ -59,9 +59,9 @@ jobs:
           latest: true
           fileName: mingw-pw3270-plugin-ipc.tar.xz
       - name: Unpack lib3270
-        run: tar -C ./.build -Jxvf mingw-lib3270.x86_64.tar.xz
+        run: tar -C ./.build -Jxvf mingw-w64-x86_64lib3270.x86_64.tar.xz
       - name: Unpack libv3270
-        run: tar -C ./.build -Jxvf mingw-libv3270.tar.xz
+        run: tar -C ./.build -Jxvf mingw-w64-x86_64-libv3270.tar.xz
       - name: Unpack ipcplugin
         run: tar -C ./.build -Jxvf mingw-pw3270-plugin-ipc.tar.xz
       - name: Unpack ipc3270
@@ -71,11 +71,11 @@ jobs:
       - name: Make Runtime
         run: /bin/bash ./win/bundle
       - name: Make Package
-        run: tar -C ./.build -Jcvf mingw64-pw3270.x86_64.tar.xz .
+        run: tar -C ./.build -Jcvf mingw-w64-x86_64-pw3270.tar.xz .
       - uses: ncipollo/release-action@v1
         with:
           tag: ${{ steps.gettag.outputs.tag }}
-          artifacts: mingw64-pw3270.x86_64.tar.xz
+          artifacts: mingw-w64-x86_64-pw3270.tar.xz
           allowUpdates: true
           draft: false
           makeLatest: true
diff --git a/win/ci-build.sh b/win/ci-build.sh
index 39d6704..11a7441 100644
--- a/win/ci-build.sh
+++ b/win/ci-build.sh
@@ -26,13 +26,13 @@ rm -fr ${myDIR}/.build
 # Unpack LIB3270
 #
 echo "Unpacking lib3270"
-tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz  > $LOGFILE 2>&1 || die "Unpack lib3270 failure"
+tar -C / -Jxf ${MINGW_PACKAGE_PREFIX}-lib3270.tar.xz > $LOGFILE 2>&1 || die "Unpack lib3270 failure"
 
 #
-# Build LIBV3270
+# Unpack LIBV3270
 #
 echo "Unpacking libv3270"
-tar -C / -Jxf mingw-libv3270.tar.xz  > $LOGFILE 2>&1 || die "Unpack libv3270 failure"
+tar -C / -Jxf ${MINGW_PACKAGE_PREFIX}-libv3270.tar.xz > $LOGFILE 2>&1 || die "Unpack libv3270 failure"
 
 #
 # Build PW3270
@@ -45,7 +45,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure"
 make all  > $LOGFILE 2>&1 || die "Make failure"
 
 make DESTDIR=.bin/package install
-tar --create --xz --file=mingw-pw3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose .
+tar --create --xz --file=${MINGW_PACKAGE_PREFIX}-pw3270.tar.xz --directory=.bin/package --verbose .
 
 echo "Build complete"
 
--
libgit2 0.21.2