update for binpkg install option instead of bingem

mcorino · Feb 16, 2024 · 4bd7e53 · 4bd7e53
1 parent d68e2fa
commit 4bd7e53
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 36 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -134,7 +134,7 @@ jobs:
             configure_flags:
             use_xvfb: true
             wxw_type: embed
-            wxr_type: bingem
+            wxr_type: binpkg
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} wxRuby(${{ matrix.wxr_type }}) ${{ matrix.CXX }} ruby-${{ matrix.ruby }} wxWidgets-${{ matrix.wxWidgets }}(${{ matrix.wxw_type }}) SWIG${{ matrix.swig }}
     env:
@@ -254,34 +254,25 @@ jobs:
         ruby tools/check_swig_types.rb
 
     - name: Build wxRuby3 gem
-      if: matrix.wxr_type == 'gem' || matrix.wxr_type == 'bingem'
+      if: matrix.wxr_type == 'gem' || matrix.wxr_type == 'binpkg'
       run: |
-        if [ "${{ matrix.wxr_type }}" == "gem" ]; then
-          bundle exec rake gem
-        else
-          BUILD_CMD="bundle exec rake bingem"
-          /bin/bash -o pipefail -c "xvfb-run -a -s '-screen 0 1600x1200x24' $BUILD_CMD 2>&1 | tee -a gembuild.out" || rc=$?
-          if [ -n "$rc" ]; then
-            if fgrep -q '(core dumped)' gembuild.out; then
-              echo '*** Test crashed, trying to get more information ***'
-              gdb --quiet --core=core -ex 'where' -ex 'thread apply all bt' -ex 'q' --args $BUILD_CMD
-            fi
-            exit $rc
-          fi
+        bundle exec rake gem
+        if [ "${{ matrix.wxr_type }}" == "binpkg" ]; then
+          bundle exec rake binpkg
         fi
 
     - name: Install wxRuby3 gem
       if: matrix.wxr_type != 'develop'
       run: |
-        if [ "${{ matrix.wxr_type }}" == "bingem" ]; then
-          gem install $(echo pkg/*.gem)
+        if [ "${{ matrix.wxr_type }}" == "binpkg" ]; then
+          gem install $(echo pkg/*.gem) -- package=`pwd`/$(echo pkg/*.pkg)
         else
           if [ "${{ matrix.wxw_type }}" == "system" ]; then
-            gem install $(echo pkg/*.gem) && wxruby setup
+            gem install $(echo pkg/*.gem) -- prebuilt=none && wxruby setup -- --wxwin=@system
           elif [ "${{ matrix.wxw_type }}" == "embed" ]; then
-            gem install $(echo pkg/*.gem) && wxruby setup --autoinstall
+            gem install $(echo pkg/*.gem) -- prebuilt=none && wxruby setup --autoinstall
           else
-            gem install $(echo pkg/*.gem) && wxruby setup --wxwin=$WXWIN_INSTALL
+            gem install $(echo pkg/*.gem) -- prebuilt=none && wxruby setup --wxwin=$WXWIN_INSTALL
           fi
         fi
 

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -86,7 +86,7 @@ jobs:
           swig: '4'
           configure_flags: --disable-sys-libs
           wxw_type: embed
-          wxr_type: bingem
+          wxr_type: binpkg
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
@@ -295,30 +295,29 @@ jobs:
         ruby tools/check_swig_types.rb
 
     - name: Build wxRuby3 gem
-      if: matrix.wxr_type == 'gem' || matrix.wxr_type == 'bingem'
+      if: matrix.wxr_type == 'gem' || matrix.wxr_type == 'binpkg'
       run: |
-        if [ "${{ matrix.wxr_type }}" == "gem" ]; then
-          bundle exec rake gem
-        else
-          bundle exec rake bingem
+        bundle exec rake gem
+        if [ "${{ matrix.wxr_type }}" == "binpkg" ]; then
+          bundle exec rake binpkg
         fi
 
     - name: Remove wxWidgets
-      if: matrix.wxw_type == 'develop' && matrix.wxr_type == 'bingem'
+      if: matrix.wxw_type == 'develop' && matrix.wxr_type == 'binpkg'
       run: rm -rf $WXWIDGETS_ROOT
 
     - name: Install wxRuby3 gem
       if: matrix.wxr_type != 'develop'
       run: |
-        if [ "${{ matrix.wxr_type }}" == "bingem" ]; then
-          gem install $(echo pkg/*.gem)
+        if [ "${{ matrix.wxr_type }}" == "binpkg" ]; then
+          gem install $(echo pkg/*.gem) -- package=`pwd`/$(echo pkg/*.pkg)
         else
           if [ "${{ matrix.wxw_type }}" == "system" ]; then
-            gem install $(echo pkg/*.gem) && wxruby setup
+            gem install $(echo pkg/*.gem) -- prebuilt=none && wxruby setup --wxwin=@system
           elif [ "${{ matrix.wxw_type }}" == "embed" ]; then
-            gem install $(echo pkg/*.gem) && wxruby setup --autoinstall
+            gem install $(echo pkg/*.gem) -- prebuilt=none && wxruby setup --autoinstall
           else
-            gem install $(echo pkg/*.gem) && wxruby setup --wxwin=$WXWIN_INSTALL
+            gem install $(echo pkg/*.gem) -- prebuilt=none && wxruby setup --wxwin=$WXWIN_INSTALL
           fi
         fi
 

diff --git a/.github/workflows/msw.yml b/.github/workflows/msw.yml
@@ -83,7 +83,7 @@ jobs:
             wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
-            wxr_type: bingem
+            wxr_type: binpkg
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
@@ -189,21 +189,24 @@ jobs:
       - name: Build wxRuby3 gem
         if: matrix.wxr_type != 'develop'
         run: |
-          bundle exec rake ${{ matrix.wxr_type }}
+          bundle exec rake gem
+          If ("${{ matrix.wxr_type }}" -eq "binpkg") {
+            bundle exec rake binpkg
+          }
 
       - name: Install wxRuby3 gem
         if: matrix.wxr_type != 'develop'
         run: |
           If ("${{ matrix.wxw_type }}" -eq "embed") {
             If ("${{ matrix.wxr_type }}" -eq "gem") {
-              foreach ($f in Get-ChildItem -Path pkg\*.gem) { gem install $f && wxruby setup --autoinstall }
+              foreach ($f in Get-ChildItem -Path pkg\*.gem) { gem install $f -- prebuilt=none && wxruby setup --autoinstall }
             }
             Else {
-              foreach ($f in Get-ChildItem -Path pkg\*.gem) { gem install $f }
+              foreach ($f in Get-ChildItem -Path pkg\*.gem) { foreach ($p in Get-ChildItem -Path pkg\*.pkg) {  gem install $f -- package=$p } }
             }
           }
           Else {
-            foreach ($f in Get-ChildItem -Path pkg\*.gem) { gem install $f && wxruby setup --wxwin=$env:WXWIN_ROOT }
+            foreach ($f in Get-ChildItem -Path pkg\*.gem) { gem install $f --prebuilt=none && wxruby setup --wxwin=$env:WXWIN_ROOT }
           }
 
       - name: Run wxRuby3 regression tests