Commit 33f7f94a8adae274f9e0fabfccd9f7d14a8b3638
1 parent
5b587056
Exists in
develop
Debugging win32 package.
Showing
2 changed files
with
12 additions
and
7 deletions
Show diff stats
.github/workflows/publish.yml
@@ -73,7 +73,7 @@ jobs: | @@ -73,7 +73,7 @@ jobs: | ||
73 | - uses: ncipollo/release-action@v1 | 73 | - uses: ncipollo/release-action@v1 |
74 | with: | 74 | with: |
75 | tag: ${{ steps.gettag.outputs.tag }} | 75 | tag: ${{ steps.gettag.outputs.tag }} |
76 | - artifacts: "*-pw3270-*.tar.*" | 76 | + artifacts: "*.zip" |
77 | allowUpdates: true | 77 | allowUpdates: true |
78 | draft: true | 78 | draft: true |
79 | makeLatest: true | 79 | makeLatest: true |
win/bundle.common
@@ -392,18 +392,19 @@ make_packages() { | @@ -392,18 +392,19 @@ make_packages() { | ||
392 | echo "----------------------------------" | 392 | echo "----------------------------------" |
393 | find ${srcdir} -iname *.nsi | 393 | find ${srcdir} -iname *.nsi |
394 | echo "----------------------------------" | 394 | echo "----------------------------------" |
395 | + find ${buildroot} -iname *.nsi | ||
396 | + echo "----------------------------------" | ||
395 | 397 | ||
396 | if [ -e "${srcdir}/win/${PACKAGE_NAME}.nsi" ]; then | 398 | if [ -e "${srcdir}/win/${PACKAGE_NAME}.nsi" ]; then |
397 | mkdir -p "${buildroot}${MINGW_PREFIX}/nsi" | 399 | mkdir -p "${buildroot}${MINGW_PREFIX}/nsi" |
398 | cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi" | 400 | cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi" |
399 | - if [ "$?" != "0" ]; then | ||
400 | - echo "Cant copy nsis script" | ||
401 | - fi | ||
402 | - | ||
403 | - argument "nsi" > /dev/null | ||
404 | if [ "$?" == "0" ]; then | 401 | if [ "$?" == "0" ]; then |
405 | - make_nsis | 402 | + echo "Nsis script installed" |
403 | + else | ||
404 | + echo "Erro installing nsis" | ||
406 | fi | 405 | fi |
406 | + else | ||
407 | + echo "Cant find | ||
407 | fi | 408 | fi |
408 | 409 | ||
409 | argument "zip" > /dev/null | 410 | argument "zip" > /dev/null |
@@ -411,6 +412,10 @@ make_packages() { | @@ -411,6 +412,10 @@ make_packages() { | ||
411 | make_zip | 412 | make_zip |
412 | fi | 413 | fi |
413 | 414 | ||
415 | + argument "nsi" > /dev/null | ||
416 | + if [ "$?" == "0" ]; then | ||
417 | + make_nsis | ||
418 | + fi | ||
414 | 419 | ||
415 | } | 420 | } |
416 | 421 |