Merge pull request #254 from mcorino/develop

Develop

.cirrus.yml

@@ -5,18 +5,10 @@ env:
   WXRUBY_TEST_EXCLUDE: 'test_intl:test_media_ctrl'
   GITHUB_TOKEN: ENCRYPTED[2ce3914266dec78118dd9706c25d2e52fbd164f86713692efde9b8af5f0159099cb299934a8d6279e524da7a0790e025]
 
-verify_task:
+pr_task:
   skip: "changesIncludeOnly('.yardopts','*.md','.circleci/**','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb')"
-  only_if: $CIRRUS_BRANCH =~ 'master' && $CIRRUS_BUILD_SOURCE != 'api'
+  only_if: $CIRRUS_PR != ''
   matrix:
-    - name: Cirrus CI / Fedora AMD64 Test
-      container:
-        image: fedora:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: fedora
     - name: Cirrus CI / Fedora ARM64 Test
       arm_container:
         image: fedora:latest
@@ -33,38 +25,6 @@ verify_task:
       env:
         osname: linux
         distro: opensuse
-    - name: Cirrus CI / OpenSuSE Leap ARM64 Test
-      arm_container:
-        image: opensuse/leap:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: opensuse
-    - name: Cirrus CI / Ubuntu AMD64 Test
-      container:
-        image: ubuntu:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: ubuntu
-    - name: Cirrus CI / Ubuntu ARM64 Test
-      arm_container:
-        image: ubuntu:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: ubuntu
-    - name: Cirrus CI / Debian AMD64 Test
-      container:
-        image: debian:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: debian
     - name: Cirrus CI / Debian ARM64 Test
       arm_container:
         image: debian:latest
@@ -73,6 +33,12 @@ verify_task:
       env:
         osname: linux
         distro: debian
+    - name: Cirrus CI / MacOSX Ventura M1 Release
+      macos_instance:
+        image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
+      env:
+        osname: darwin
+        distro: macosx
 
   before_script: |
     ./tools/scripts/cirrus/setup-$distro.sh
@@ -103,94 +69,48 @@ verify_task:
   latest_test_script:
     ./tools/scripts/cirrus/test-wxruby3.sh
 
-release_task:
-  only_if: $CIRRUS_BUILD_SOURCE == 'api'
+verify_task:
+  skip: "changesIncludeOnly('.yardopts','*.md','.circleci/**','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb')"
+  only_if: $CIRRUS_BRANCH =~ 'master' && $CIRRUS_BUILD_SOURCE != 'api'
   matrix:
-    - name: Cirrus CI / Fedora AMD64 Release
+    - name: Cirrus CI / Fedora AMD64 Test
       container:
         image: fedora:latest
         cpu: 4
         memory: 8G
       env:
         osname: linux
         distro: fedora
-    - name: Cirrus CI / Fedora ARM64 Release
-      arm_container:
-        image: fedora:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: fedora
-    - name: Cirrus CI / OpenSuSE Leap AMD64 Release
+    - name: Cirrus CI / OpenSuSE Leap AMD64 Test
       container:
         image: opensuse/leap:latest
         cpu: 4
         memory: 8G
       env:
         osname: linux
         distro: opensuse
-    - name: Cirrus CI / OpenSuSE Leap ARM64 Release
+    - name: Cirrus CI / OpenSuSE Leap ARM64 Test
       arm_container:
         image: opensuse/leap:latest
         cpu: 4
         memory: 8G
       env:
         osname: linux
         distro: opensuse
-    - name: Cirrus CI / Ubuntu AMD64 Release
-      container:
-        image: ubuntu:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: ubuntu
-    - name: Cirrus CI / Ubuntu ARM64 Release
-      arm_container:
-        image: ubuntu:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: ubuntu
-    - name: Cirrus CI / Debian AMD64 Release
+    - name: Cirrus CI / Debian AMD64 Test
       container:
         image: debian:latest
         cpu: 4
         memory: 8G
       env:
         osname: linux
         distro: debian
-    - name: Cirrus CI / Debian ARM64 Release
-      arm_container:
-        image: debian:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: debian
-    - name: Cirrus CI / MacOSX Monterey M1 Release
-      macos_instance:
-        image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
-      env:
-        osname: darwin
-        distro: macosx
-        latest_only: true
-    - name: Cirrus CI / MacOSX Ventura M1 Release
-      macos_instance:
-        image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
-      env:
-        osname: darwin
-        distro: macosx
-        latest_only: true
     - name: Cirrus CI / MacOSX Sonoma M1 Release
       macos_instance:
         image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
       env:
         osname: darwin
         distro: macosx
-        latest_only: true
 
   before_script: |
     ./tools/scripts/cirrus/setup-$distro.sh
@@ -203,7 +123,10 @@ release_task:
   system_build_script: |
     ./tools/scripts/cirrus/setup-$distro-system-ruby.sh
 
-    ./tools/scripts/cirrus/build-wxruby3.sh --binpkg 2>&1 | tee -a build-wxruby3.log    
+    ./tools/scripts/cirrus/build-wxruby3.sh 2>&1 | tee -a build-wxruby3.log    
+
+  system_test_script:
+    ./tools/scripts/cirrus/test-wxruby3.sh
 
   system_cleanup_script: |
     ./tools/scripts/cirrus/cleanup-wxruby3.sh
@@ -213,132 +136,7 @@ release_task:
   latest_build_script:
     ./tools/scripts/cirrus/setup-ruby-install-latest.sh
 
-    ./tools/scripts/cirrus/build-wxruby3.sh --latest --binpkg 2>&1 | tee -a build-wxruby3.log
-
-  release_script:
-
-    ruby tools/scripts/cirrus/upload-release-pkg.rb
-
-test_release_task:
-  only_if: $CIRRUS_BUILD_SOURCE == 'api'
-  depends_on:
-    - Cirrus CI / Fedora AMD64 Release
-    - Cirrus CI / OpenSuSE Leap AMD64 Release
-    - Cirrus CI / Ubuntu AMD64 Release
-    - Cirrus CI / Debian AMD64 Release
-    - Cirrus CI / Fedora ARM64 Release
-    - Cirrus CI / OpenSuSE Leap ARM64 Release
-    - Cirrus CI / Ubuntu ARM64 Release
-    - Cirrus CI / Debian ARM64 Release
-    - Cirrus CI / MacOSX Monterey M1 Release
-    - Cirrus CI / MacOSX Ventura M1 Release
-    - Cirrus CI / MacOSX Sonoma M1 Release
-  matrix:
-    - name: Cirrus CI / Fedora AMD64 Release Test
-      container:
-        image: fedora:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: fedora
-    - name: Cirrus CI / Fedora ARM64 Release Test
-      arm_container:
-        image: fedora:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: fedora
-    - name: Cirrus CI / OpenSuSE Leap AMD64 Release Test
-      container:
-        image: opensuse/leap:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: opensuse
-    - name: Cirrus CI / OpenSuSE Leap ARM64 Release Test
-      arm_container:
-        image: opensuse/leap:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: opensuse
-    - name: Cirrus CI / Ubuntu AMD64 Release Test
-      container:
-        image: ubuntu:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: ubuntu
-    - name: Cirrus CI / Ubuntu ARM64 Release Test
-      arm_container:
-        image: ubuntu:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: ubuntu
-    - name: Cirrus CI / Debian AMD64 Release Test
-      container:
-        image: debian:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: debian
-    - name: Cirrus CI / Debian ARM64 Release Test
-      arm_container:
-        image: debian:latest
-        cpu: 4
-        memory: 8G
-      env:
-        osname: linux
-        distro: debian
-    - name: Cirrus CI / MacOSX Monterey M1 Release Test
-      macos_instance:
-        image: ghcr.io/cirruslabs/macos-monterey-xcode:latest
-      env:
-        osname: darwin
-        distro: macosx
-        latest_only: true
-    - name: Cirrus CI / MacOSX Ventura M1 Release Test
-      macos_instance:
-        image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
-      env:
-        osname: darwin
-        distro: macosx
-        latest_only: true
-    - name: Cirrus CI / MacOSX Sonoma M1 Release Test
-      macos_instance:
-        image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
-      env:
-        osname: darwin
-        distro: macosx
-        latest_only: true
-
-  before_script: |
-    ./tools/scripts/cirrus/setup-$distro.sh test
-
-    # Show some information about the system.
-    uname -a
-    locale
-    locale -a
-
-  system_test_script: |
-    ./tools/scripts/cirrus/setup-$distro-system-ruby.sh
-
-    ./tools/scripts/cirrus/test-wxruby3-release.sh
-
-  system_cleanup_script: |
-    ./tools/scripts/cirrus/cleanup-wxruby3.sh
-    
-    ./tools/scripts/cirrus/setup-$distro-system-ruby.sh remove
+    ./tools/scripts/cirrus/build-wxruby3.sh --latest 2>&1 | tee -a build-wxruby3.log
 
   latest_test_script:
-    ./tools/scripts/cirrus/setup-ruby-install-latest.sh
-
-    ./tools/scripts/cirrus/test-wxruby3-release.sh
+    ./tools/scripts/cirrus/test-wxruby3.sh

.github/workflows/linux.yml

@@ -80,7 +80,7 @@ jobs:
             swig: '4'
             configure_flags:
             use_xvfb: true
-            wxw_type: embed
+            wxw_type: develop
             wxr_type: gem
           - os: ubuntu-22.04
             gtk_version: 3
@@ -281,6 +281,9 @@ jobs:
     - name: Check wxRuby3 gem install
       if: matrix.wxr_type != 'develop'
       run: |
+        if [ "${{ matrix.wxw_type }}" == "develop" ]; then
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$WXWIN_INSTALL/lib
+        fi
         wxruby check
 
     - name: Run wxRuby3 regression tests

.github/workflows/release.yml

@@ -81,9 +81,9 @@ jobs:
     - name: Trigger Cirrus CI Release Tasks
       run: |
         if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-          ruby tools/scripts/cirrus/start_release_tasks.rb ${{ github.ref }}
+          ruby tools/scripts/cirrus/start_release_tasks.rb "$GITHUB_REF_NAME"
         else
-          ruby tools/scripts/cirrus/start_release_tasks.rb
+          ruby tools/scripts/cirrus/start_release_tasks.rb --release "$GITHUB_REF_NAME"
         fi
 
     - name: Upload Gem as release test artifact

rakelib/lib/config/linux.rb

@@ -81,7 +81,7 @@ def init_platform
         @dll_pfx = 'lib'
 
         if @wx_version
-          @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-maybe-uninitialized]
+          @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-maybe-uninitialized -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
           @ruby_ldflags << '-s' if @release_build  # strip debug symbols for release build

rakelib/lib/director/menu.rb

@@ -90,9 +90,8 @@ class wxRubyMenu : public wxMenu
         # fix SWIG's problems with const& return value
         spec.ignore('wxMenu::GetTitle', ignore_doc: false) # keep doc
         spec.add_extend_code 'wxMenu', <<~__HEREDOC
-          wxString* GetTitle() const {
-            wxString const& title = $self->GetTitle();
-            return &const_cast<wxString&> (title);
+          wxString GetTitle() const {
+            return $self->GetTitle();
           }
 
           VALUE each_item()