Merge pull request #290 from mcorino/develop

add macos14 x86_64 runner (incl. release) and simplify workflows
mcorino · Aug 12, 2024 · 3925e42 · 3925e42
2 parents 4962119 + 42c64da
commit 3925e42
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 29 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -55,7 +55,6 @@ jobs:
             CC: gcc-9
             CXX: g++-9
             ruby: '2.5'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -66,7 +65,6 @@ jobs:
             CC: gcc-10
             CXX: g++-10
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -77,7 +75,6 @@ jobs:
             CC: gcc-9
             CXX: g++-9
             ruby: '2.5'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -88,7 +85,6 @@ jobs:
             CC: gcc-11
             CXX: g++-11
             ruby: '3.0'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -99,7 +95,6 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -110,7 +105,6 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: '3.2'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -121,7 +115,6 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -132,14 +125,13 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
             wxw_type: embed
             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 }}
+    name: ${{ matrix.os }} wxRuby(${{ matrix.wxr_type }}) ${{ matrix.CXX }} ruby-${{ matrix.ruby }} wxWidgets-${{ vars.WXWIDGETS_LATEST_STABLE }}(${{ matrix.wxw_type }}) SWIG${{ matrix.swig }}
     env:
       wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}
       wxCONFIGURE_FLAGS: ${{ matrix.configure_flags }}
@@ -167,7 +159,7 @@ jobs:
       with:
         repository: wxWidgets/wxWidgets
         path: ${{ env.WXWIDGETS_ROOT }}
-        ref: v${{ matrix.wxWidgets }}
+        ref: v${{ env.WXWIDGETS_LATEST_STABLE }}
         submodules: 'recursive'
 
     - name: Prepare package repos

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -47,7 +47,7 @@ jobs:
 
     runs-on: ${{ matrix.runner }}
 
-    name: ${{ matrix.name }} wxRuby(${{ matrix.wxr_type }}) ruby-${{ matrix.ruby }} wxWidgets-${{ matrix.wxWidgets }}(${{ matrix.wxw_type }}) SWIG${{ matrix.swig }}
+    name: ${{ matrix.name }} wxRuby(${{ matrix.wxr_type }}) ruby-${{ matrix.ruby }} wxWidgets-${{ vars.WXWIDGETS_LATEST_STABLE }}(${{ matrix.wxw_type }}) SWIG${{ matrix.swig }}
 
     strategy:
       fail-fast: false
@@ -56,7 +56,6 @@ jobs:
         - name: wxMac macOS 12
           runner: macos-12
           arch: x86_64
-          wxWidgets: '3.2.4'
           ruby: 'ruby'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -65,7 +64,6 @@ jobs:
         - name: wxMac macOS 12
           runner: macos-12
           arch: x86_64
-          wxWidgets: '3.2.4'
           ruby: 'ruby'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -74,7 +72,6 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.4'
           ruby: 'ruby'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -83,7 +80,6 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.4'
           ruby: 'ruby'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -92,7 +88,6 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.4'
           ruby: 'ruby'
           swig: '4'
           configure_flags: --disable-sys-libs
@@ -101,12 +96,19 @@ jobs:
         - name: wxMac macOS 13
           runner: macos-13
           arch: x86_64
-          wxWidgets: '3.2.4'
           ruby: 'ruby'
           swig: '4'
           configure_flags: --disable-sys-libs
           wxw_type: system
           wxr_type: gem
+        - name: wxMac macOS 14
+          runner: macos-14
+          arch: x86_64
+          ruby: 'ruby'
+          swig: '4'
+          configure_flags: --disable-sys-libs
+          wxw_type: develop
+          wxr_type: develop
 
     env:
       DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
@@ -138,7 +140,7 @@ jobs:
       with:
         repository: wxWidgets/wxWidgets
         path: ${{ env.WXWIDGETS_ROOT }}
-        ref: v${{ matrix.wxWidgets }}
+        ref: v${{ env.WXWIDGETS_LATEST_STABLE }}
         submodules: 'recursive'
 
     - name: Set environment variables

diff --git a/.github/workflows/msw.yml b/.github/workflows/msw.yml
@@ -49,7 +49,7 @@ env:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    name: wxMSW wxRuby(${{ matrix.wxr_type }}) ${{ matrix.CXX }} ruby-${{ matrix.ruby }} wxWidgets-${{ matrix.wxWidgets }}(${{ matrix.wxw_type }}) SWIG${{ matrix.swig }}
+    name: wxMSW wxRuby(${{ matrix.wxr_type }}) ${{ matrix.CXX }} ruby-${{ matrix.ruby }} wxWidgets-${{ vars.WXWIDGETS_LATEST_STABLE }}(${{ matrix.wxw_type }}) SWIG${{ matrix.swig }}
     strategy:
       fail-fast: false
       matrix:
@@ -58,47 +58,41 @@ jobs:
             platform: 'x64'
             CXX: g++-12
             ruby: '2.7'
-            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: develop
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: develop
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: develop
             wxr_type: develop
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: binpkg
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: embed
             wxr_type: gem
           - os: windows-2022
             platform: 'x64'
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             wxw_type: develop
             wxr_type: gem
@@ -113,7 +107,7 @@ jobs:
         with:
           repository: wxWidgets/wxWidgets
           path: ${{ env.WXWIDGETS_ROOT }}
-          ref: v${{ matrix.wxWidgets }}
+          ref: v${{ env.WXWIDGETS_LATEST_STABLE }}
           submodules: 'recursive'
 
       - name: Install Ruby

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -219,6 +219,10 @@ jobs:
             os: macos-13
             arch: x86_64
             ruby: 'ruby'
+          - name: macOS14
+            os: macos-14
+            arch: x86_64
+            ruby: 'ruby'
 
     steps:
       - name: Checkout wxRuby3
@@ -290,7 +294,6 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -302,7 +305,6 @@ jobs:
             CC: gcc-12
             CXX: g++-12
             ruby: 'ruby'
-            wxWidgets: '3.2.4'
             swig: '4'
             configure_flags:
             use_xvfb: true
@@ -318,11 +320,17 @@ jobs:
             arch: x86_64
             ruby: 'ruby'
             build: false
+          - name: macOS14
+            os: macos-14
+            arch: x86_64
+            ruby: 'ruby'
+            build: false
 
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} wxRuby Gem Test (${{ github.ref_name }})
     env:
       WXWIDGETS_ROOT: ${{ github.workspace }}/ext/wxWidgets
+      WXWIDGETS_LATEST_STABLE: ${{ vars.WXWIDGETS_LATEST_STABLE }}
       wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}
       wxCONFIGURE_FLAGS: ${{ matrix.configure_flags }}
       wxUSE_ASAN: ${{ matrix.use_asan && 1 || 0 }}
@@ -344,7 +352,7 @@ jobs:
         with:
           repository: wxWidgets/wxWidgets
           path: ${{ env.WXWIDGETS_ROOT }}
-          ref: v${{ matrix.wxWidgets }}
+          ref: v${{ env.WXWIDGETS_LATEST_STABLE }}
           submodules: 'recursive'
 
       - name: Prepare package repos