From d9a02bfb3e41272959475e355950e57bdac37c77 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Tue, 13 Aug 2024 11:30:40 +0200 Subject: [PATCH 1/7] remove MacOS Ventura (13) as it is no longer available --- tools/scripts/cirrus/cirrus-release.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/scripts/cirrus/cirrus-release.yml b/tools/scripts/cirrus/cirrus-release.yml index 4bc99f38..2d9f8b13 100644 --- a/tools/scripts/cirrus/cirrus-release.yml +++ b/tools/scripts/cirrus/cirrus-release.yml @@ -72,13 +72,6 @@ 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 @@ -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 @@ -191,13 +183,6 @@ 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 From 1c06f8d747bc820a2e7c3222ac7ca5672bd1f828 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Tue, 13 Aug 2024 12:37:17 +0200 Subject: [PATCH 2/7] correct macos sonoma image name --- tools/scripts/cirrus/cirrus-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scripts/cirrus/cirrus-release.yml b/tools/scripts/cirrus/cirrus-release.yml index 2d9f8b13..60533857 100644 --- a/tools/scripts/cirrus/cirrus-release.yml +++ b/tools/scripts/cirrus/cirrus-release.yml @@ -74,7 +74,7 @@ release_task: distro: debian - 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 @@ -185,7 +185,7 @@ test_release_task: distro: debian - 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 From 2b06f188594bbc1aa8f1855a243350cc08327b32 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 14 Aug 2024 14:33:07 +0200 Subject: [PATCH 3/7] upgrade to latest OpenSuSE release --- tools/scripts/cirrus/cirrus-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scripts/cirrus/cirrus-release.yml b/tools/scripts/cirrus/cirrus-release.yml index 60533857..a68e8236 100644 --- a/tools/scripts/cirrus/cirrus-release.yml +++ b/tools/scripts/cirrus/cirrus-release.yml @@ -137,7 +137,7 @@ 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: @@ -145,7 +145,7 @@ test_release_task: 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: From b9f4991bf8c147b3f77cb33991b4bd9979d2efab Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 14 Aug 2024 14:33:38 +0200 Subject: [PATCH 4/7] fix testing with OLD system Ruby on OpenSuSE --- tools/scripts/cirrus/setup-opensuse-system-ruby.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/scripts/cirrus/setup-opensuse-system-ruby.sh b/tools/scripts/cirrus/setup-opensuse-system-ruby.sh index 56abc4ea..7e5fce1e 100755 --- a/tools/scripts/cirrus/setup-opensuse-system-ruby.sh +++ b/tools/scripts/cirrus/setup-opensuse-system-ruby.sh @@ -5,4 +5,6 @@ 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 minitest compatible with system Ruby (2.5) + gem install minitest -v 5.15.0 fi From f507ce59f2539884e7bf2ed2655d40d7e4978048 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 14 Aug 2024 14:43:46 +0200 Subject: [PATCH 5/7] fix testing with OLD system Ruby on OpenSuSE --- tools/scripts/cirrus/setup-opensuse-system-ruby.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/scripts/cirrus/setup-opensuse-system-ruby.sh b/tools/scripts/cirrus/setup-opensuse-system-ruby.sh index 7e5fce1e..b693aed6 100755 --- a/tools/scripts/cirrus/setup-opensuse-system-ruby.sh +++ b/tools/scripts/cirrus/setup-opensuse-system-ruby.sh @@ -5,6 +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 minitest compatible with system Ruby (2.5) + # provide older gems compatible with system Ruby (2.5) gem install minitest -v 5.15.0 + gem install nokogiri -v 1.12.5 fi From b2b761e3c8e1cc62491047198977819613d52f34 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 14 Aug 2024 15:03:38 +0200 Subject: [PATCH 6/7] correct names; improve skip filters --- .cirrus.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index de48611a..9443e0b2 100644 --- 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: From c0e6d47f3111da152f385808ac50e0d351033be3 Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Wed, 14 Aug 2024 15:05:20 +0200 Subject: [PATCH 7/7] correct skip filters --- .cirrus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9443e0b2..daf61eaa 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,7 +7,7 @@ env: pr_1_task: timeout_in: 90m - skip: "changesIncludeOnly('.yardopts', 'cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')" + 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', 'cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')" + 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 @@ -81,7 +81,7 @@ pr_2_task: verify_1_task: timeout_in: 90m - skip: "changesIncludeOnly('.yardopts', 'cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')" + 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 @@ -127,7 +127,7 @@ verify_1_task: verify_2_task: timeout_in: 90m - skip: "changesIncludeOnly('.yardopts', 'cirrus.yml', 'LICENSE','*.md','.github/**','lib/wx/doc/**','assets/**','lib/wx/version.rb', 'tools/**')" + 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