Merge pull request #294 from mcorino/develop

CI script updates
mcorino · Aug 14, 2024 · 38dcbdc · 38dcbdc
2 parents 0626fb3 + c0e6d47
commit 38dcbdc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -7,7 +7,7 @@ env:
 
 pr_1_task:
   timeout_in: 90m
-  skip: "changesIncludeOnly('.yardopts','*.md','.circleci/**','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb')"
+  skip: "changesIncludeOnly('.yardopts', '.cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')"
   only_if: $CIRRUS_PR != ''
   matrix:
     - name: Cirrus CI / Fedora ARM64 Test
@@ -45,7 +45,7 @@ pr_1_task:
 
 pr_2_task:
   timeout_in: 90m
-  skip: "changesIncludeOnly('.yardopts','*.md','.circleci/**','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb')"
+  skip: "changesIncludeOnly('.yardopts', '.cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')"
   only_if: $CIRRUS_PR != ''
   matrix:
     - name: Cirrus CI / Debian ARM64 Test
@@ -56,7 +56,7 @@ pr_2_task:
       env:
         osname: linux
         distro: debian
-    - name: Cirrus CI / MacOSX Ventura M1 Release
+    - name: Cirrus CI / MacOSX Ventura M1 Test
       macos_instance:
         image: ghcr.io/cirruslabs/macos-ventura-xcode:latest
       env:
@@ -81,7 +81,7 @@ pr_2_task:
 
 verify_1_task:
   timeout_in: 90m
-  skip: "changesIncludeOnly('.yardopts','*.md','.circleci/**','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb')"
+  skip: "changesIncludeOnly('.yardopts', '.cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')"
   only_if: $CIRRUS_BRANCH =~ 'master' && $CIRRUS_BUILD_SOURCE != 'api'
   matrix:
     - name: Cirrus CI / Fedora AMD64 Test
@@ -100,7 +100,7 @@ verify_1_task:
       env:
         osname: linux
         distro: opensuse
-    - name: Cirrus CI / Ubuntu AMD64 Release
+    - name: Cirrus CI / Ubuntu AMD64 Test
       container:
         image: ubuntu:latest
         cpu: 4
@@ -127,7 +127,7 @@ verify_1_task:
 
 verify_2_task:
   timeout_in: 90m
-  skip: "changesIncludeOnly('.yardopts','*.md','.circleci/**','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb')"
+  skip: "changesIncludeOnly('.yardopts', '.cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')"
   only_if: $CIRRUS_BRANCH =~ 'master' && $CIRRUS_BUILD_SOURCE != 'api'
   matrix:
     - name: Cirrus CI / OpenSuSE Leap ARM64 Test
@@ -146,7 +146,7 @@ verify_2_task:
       env:
         osname: linux
         distro: debian
-    - name: Cirrus CI / MacOSX Sonoma M1 Release
+    - name: Cirrus CI / MacOSX Sonoma M1 Test
       macos_instance:
         image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
       env:

diff --git a/tools/scripts/cirrus/cirrus-release.yml b/tools/scripts/cirrus/cirrus-release.yml
@@ -72,16 +72,9 @@ release_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
-        latest_only: true
     - name: Cirrus CI / MacOSX Sonoma M1 Release
       macos_instance:
-        image: ghcr.io/cirruslabs/macos-sonoma-xcode:latest
+        image: ghcr.io/cirruslabs/macos-sonoma:latest
       env:
         osname: darwin
         distro: macosx
@@ -124,7 +117,6 @@ test_release_task:
     - Cirrus CI / OpenSuSE Leap ARM64 Release
     - Cirrus CI / Ubuntu ARM64 Release
     - Cirrus CI / Debian ARM64 Release
-    - Cirrus CI / MacOSX Ventura M1 Release
     - Cirrus CI / MacOSX Sonoma M1 Release
   matrix:
     - name: Cirrus CI / Fedora Latest AMD64 Release Test
@@ -145,15 +137,15 @@ test_release_task:
         distro: fedora
     - name: Cirrus CI / OpenSuSE Leap AMD64 Release Test
       container:
-        image: opensuse/leap:15.5
+        image: opensuse/leap:15.6
         cpu: 4
         memory: 8G
       env:
         osname: linux
         distro: opensuse
     - name: Cirrus CI / OpenSuSE Leap ARM64 Release Test
       arm_container:
-        image: opensuse/leap:15.5
+        image: opensuse/leap:15.6
         cpu: 4
         memory: 8G
       env:
@@ -191,16 +183,9 @@ test_release_task:
       env:
         osname: linux
         distro: debian
-    - 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
+        image: ghcr.io/cirruslabs/macos-sonoma:latest
       env:
         osname: darwin
         distro: macosx

diff --git a/tools/scripts/cirrus/setup-opensuse-system-ruby.sh b/tools/scripts/cirrus/setup-opensuse-system-ruby.sh
@@ -5,4 +5,7 @@ if [ "$1" == "remove" ]; then
   zypper install -y libyaml-devel libopenssl-devel
 else
   zypper install -y ruby ruby-devel ruby2.5-rubygem-bundler zlib-devel
+  # provide older gems compatible with system Ruby (2.5)
+  gem install minitest -v 5.15.0
+  gem install nokogiri -v 1.12.5
 fi