Download as
Browse Code »

Commit de4033ae7a06d03fba6133bd90324ecc5af8ebe3

Authored by Perry Werneck
1 parent e2e03c2d
Exists in develop

Debugging msys bundler.

Showing 2 changed files with 27 additions and 35 deletions   Show diff stats
.github/workflows/publish.yml
  Diff comments   View file @de4033a
@@ -27,16 +27,26 @@ jobs: @@ -27,16 +27,26 @@ jobs:
27 repository: "PerryWerneck/libv3270" 27 repository: "PerryWerneck/libv3270"
28 latest: true 28 latest: true
29 fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst" 29 fileName: "mingw-w64-x86_64-libv3270-5.4-0-x86_64.pkg.tar.zst"
  30 + - uses: robinraju/release-downloader@v1.7
  31 + with:
  32 + repository: PerryWerneck/libipc3270
  33 + latest: true
  34 + fileName: mingw-w64-x86_64-libipc3270-5.5-0-x86_64.pkg.tar.zst
  35 + - uses: robinraju/release-downloader@v1.7
  36 + with:
  37 + repository: PerryWerneck/libhllapi
  38 + latest: true
  39 + fileName: mingw-w64-x86_64-libhllapi-5.5-0-x86_64.pkg.tar.zst
  40 + - uses: robinraju/release-downloader@v1.7
  41 + with:
  42 + repository: PerryWerneck/pw3270-plugin-ipc
  43 + latest: true
  44 + fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst
30 - name: MakePackage 45 - name: MakePackage
31 run: | 46 run: |
32 pacman -U --noconfirm *.pkg.tar.zst 47 pacman -U --noconfirm *.pkg.tar.zst
33 dos2unix PKGBUILD.mingw 48 dos2unix PKGBUILD.mingw
34 makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw 49 makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw
35 - - name: MakeNSIS  
36 - run: |  
37 - ./win/bundle.msys --nsi  
38 - mv .bin/bundle/mingw64/bin/*.exe .  
39 - find . -iname '*.exe'  
40 - uses: oprypin/find-latest-tag@v1 50 - uses: oprypin/find-latest-tag@v1
41 id: gettag 51 id: gettag
42 with: 52 with:
@@ -53,24 +63,11 @@ jobs: @@ -53,24 +63,11 @@ jobs:
53 omitBody: true 63 omitBody: true
54 omitPrereleaseDuringUpdate: true 64 omitPrereleaseDuringUpdate: true
55 replacesArtifacts: true 65 replacesArtifacts: true
56 - - uses: robinraju/release-downloader@v1.7  
57 - with:  
58 - repository: PerryWerneck/libipc3270  
59 - latest: true  
60 - fileName: mingw-w64-x86_64-libipc3270-5.5-0-x86_64.pkg.tar.zst  
61 - - uses: robinraju/release-downloader@v1.7  
62 - with:  
63 - repository: PerryWerneck/libhllapi  
64 - latest: true  
65 - fileName: mingw-w64-x86_64-libhllapi-5.5-0-x86_64.pkg.tar.zst  
66 - - uses: robinraju/release-downloader@v1.7  
67 - with:  
68 - repository: PerryWerneck/pw3270-plugin-ipc  
69 - latest: true  
70 - fileName: mingw-w64-x86_64-pw3270-plugin-ipc-5.5-0-x86_64.pkg.tar.zst  
71 - name: Make bundle 66 - name: Make bundle
72 run: | 67 run: |
73 - ./win/bundle.msys 68 + ./win/bundle.msys --nsi --zip
  69 + find . -iname '*.exe'
  70 + find . -iname '*.zip'
74 rm -f *plugin* 71 rm -f *plugin*
75 tar -C ./.bin/bundle -Jcf mingw-w64-x86_64-pw3270-bundle-x86_64.tar.xz . 72 tar -C ./.bin/bundle -Jcf mingw-w64-x86_64-pw3270-bundle-x86_64.tar.xz .
76 - uses: ncipollo/release-action@v1 73 - uses: ncipollo/release-action@v1
@@ -83,16 +80,6 @@ jobs: @@ -83,16 +80,6 @@ jobs:
83 omitBody: true 80 omitBody: true
84 omitPrereleaseDuringUpdate: true 81 omitPrereleaseDuringUpdate: true
85 replacesArtifacts: true 82 replacesArtifacts: true
86 - - uses: ncipollo/release-action@v1  
87 - with:  
88 - tag: ${{ steps.gettag.outputs.tag }}  
89 - artifacts: "pw3270*.exe"  
90 - allowUpdates: true  
91 - draft: true  
92 - makeLatest: true  
93 - omitBody: true  
94 - omitPrereleaseDuringUpdate: true  
95 - replacesArtifacts: true  
96 macos-publish: 83 macos-publish:
97 runs-on: macos-latest 84 runs-on: macos-latest
98 steps: 85 steps:
win/bundle.common
  Diff comments   View file @de4033a
@@ -389,12 +389,21 @@ build_package() { @@ -389,12 +389,21 @@ build_package() {
389 389
390 make_packages() { 390 make_packages() {
391 391
  392 + echo "----------------------------------"
  393 + find ${srcdir} -iname *.nsi
  394 + echo "----------------------------------"
  395 +
392 if [ -e "${srcdir}/win/${PACKAGE_NAME}.nsi" ]; then 396 if [ -e "${srcdir}/win/${PACKAGE_NAME}.nsi" ]; then
393 mkdir -p "${buildroot}${MINGW_PREFIX}/nsi" 397 mkdir -p "${buildroot}${MINGW_PREFIX}/nsi"
394 cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi" 398 cp "${srcdir}/win/${PACKAGE_NAME}.nsi" "${buildroot}${MINGW_PREFIX}/${PACKAGE_NAME}.nsi"
395 if [ "$?" != "0" ]; then 399 if [ "$?" != "0" ]; then
396 echo "Cant copy nsis script" 400 echo "Cant copy nsis script"
397 fi 401 fi
  402 +
  403 + argument "nsi" > /dev/null
  404 + if [ "$?" == "0" ]; then
  405 + make_nsis
  406 + fi
398 fi 407 fi
399 408
400 argument "zip" > /dev/null 409 argument "zip" > /dev/null
@@ -402,10 +411,6 @@ make_packages() { @@ -402,10 +411,6 @@ make_packages() {
402 make_zip 411 make_zip
403 fi 412 fi
404 413
405 - argument "nsi" > /dev/null  
406 - if [ "$?" == "0" ]; then  
407 - make_nsis  
408 - fi  
409 414
410 } 415 }
411 416