Download as
Browse Code »

Commit 4ffe1ac96654b011279dd342400d3b6dcffd1eb1

Authored by Perry Werneck
1 parent b8f0c934
Exists in develop

Updating win32 artifact names.

Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
.github/workflows/winpkg.yml
  Diff comments   View file @4ffe1ac
@@ -33,12 +33,12 @@ jobs: @@ -33,12 +33,12 @@ jobs:
33 with: 33 with:
34 repository: PerryWerneck/lib3270 34 repository: PerryWerneck/lib3270
35 latest: true 35 latest: true
36 - fileName: mingw-lib3270.x86_64.tar.xz 36 + fileName: mingw-w64-x86_64-lib3270.tar.xz
37 - uses: robinraju/release-downloader@v1.7 37 - uses: robinraju/release-downloader@v1.7
38 with: 38 with:
39 repository: PerryWerneck/libv3270 39 repository: PerryWerneck/libv3270
40 latest: true 40 latest: true
41 - fileName: mingw-libv3270.tar.xz 41 + fileName: mingw-w64-x86_64-libv3270.tar.xz
42 - name: BuildApp 42 - name: BuildApp
43 run: ./win/ci-build.sh 43 run: ./win/ci-build.sh
44 - name: Install pw3270 44 - name: Install pw3270
@@ -59,9 +59,9 @@ jobs: @@ -59,9 +59,9 @@ jobs:
59 latest: true 59 latest: true
60 fileName: mingw-pw3270-plugin-ipc.tar.xz 60 fileName: mingw-pw3270-plugin-ipc.tar.xz
61 - name: Unpack lib3270 61 - name: Unpack lib3270
62 - run: tar -C ./.build -Jxvf mingw-lib3270.x86_64.tar.xz 62 + run: tar -C ./.build -Jxvf mingw-w64-x86_64lib3270.x86_64.tar.xz
63 - name: Unpack libv3270 63 - name: Unpack libv3270
64 - run: tar -C ./.build -Jxvf mingw-libv3270.tar.xz 64 + run: tar -C ./.build -Jxvf mingw-w64-x86_64-libv3270.tar.xz
65 - name: Unpack ipcplugin 65 - name: Unpack ipcplugin
66 run: tar -C ./.build -Jxvf mingw-pw3270-plugin-ipc.tar.xz 66 run: tar -C ./.build -Jxvf mingw-pw3270-plugin-ipc.tar.xz
67 - name: Unpack ipc3270 67 - name: Unpack ipc3270
@@ -71,11 +71,11 @@ jobs: @@ -71,11 +71,11 @@ jobs:
71 - name: Make Runtime 71 - name: Make Runtime
72 run: /bin/bash ./win/bundle 72 run: /bin/bash ./win/bundle
73 - name: Make Package 73 - name: Make Package
74 - run: tar -C ./.build -Jcvf mingw64-pw3270.x86_64.tar.xz . 74 + run: tar -C ./.build -Jcvf mingw-w64-x86_64-pw3270.tar.xz .
75 - uses: ncipollo/release-action@v1 75 - uses: ncipollo/release-action@v1
76 with: 76 with:
77 tag: ${{ steps.gettag.outputs.tag }} 77 tag: ${{ steps.gettag.outputs.tag }}
78 - artifacts: mingw64-pw3270.x86_64.tar.xz 78 + artifacts: mingw-w64-x86_64-pw3270.tar.xz
79 allowUpdates: true 79 allowUpdates: true
80 draft: false 80 draft: false
81 makeLatest: true 81 makeLatest: true
win/ci-build.sh
  Diff comments   View file @4ffe1ac
@@ -26,13 +26,13 @@ rm -fr ${myDIR}/.build @@ -26,13 +26,13 @@ rm -fr ${myDIR}/.build
26 # Unpack LIB3270 26 # Unpack LIB3270
27 # 27 #
28 echo "Unpacking lib3270" 28 echo "Unpacking lib3270"
29 -tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "Unpack lib3270 failure" 29 +tar -C / -Jxf ${MINGW_PACKAGE_PREFIX}-lib3270.tar.xz > $LOGFILE 2>&1 || die "Unpack lib3270 failure"
30 30
31 # 31 #
32 -# Build LIBV3270 32 +# Unpack LIBV3270
33 # 33 #
34 echo "Unpacking libv3270" 34 echo "Unpacking libv3270"
35 -tar -C / -Jxf mingw-libv3270.tar.xz > $LOGFILE 2>&1 || die "Unpack libv3270 failure" 35 +tar -C / -Jxf ${MINGW_PACKAGE_PREFIX}-libv3270.tar.xz > $LOGFILE 2>&1 || die "Unpack libv3270 failure"
36 36
37 # 37 #
38 # Build PW3270 38 # Build PW3270
@@ -45,7 +45,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure" @@ -45,7 +45,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure"
45 make all > $LOGFILE 2>&1 || die "Make failure" 45 make all > $LOGFILE 2>&1 || die "Make failure"
46 46
47 make DESTDIR=.bin/package install 47 make DESTDIR=.bin/package install
48 -tar --create --xz --file=mingw-pw3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose . 48 +tar --create --xz --file=${MINGW_PACKAGE_PREFIX}-pw3270.tar.xz --directory=.bin/package --verbose .
49 49
50 echo "Build complete" 50 echo "Build complete"
51 51