Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI script updates #294

Merged
merged 7 commits into from
Aug 14, 2024
Merged

CI script updates #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9a02bf
remove MacOS Ventura (13) as it is no longer available
mcorino Aug 13, 2024
1c06f8d
correct macos sonoma image name
mcorino Aug 13, 2024
2b06f18
upgrade to latest OpenSuSE release
mcorino Aug 14, 2024
b9f4991
fix testing with OLD system Ruby on OpenSuSE
mcorino Aug 14, 2024
f507ce5
fix testing with OLD system Ruby on OpenSuSE
mcorino Aug 14, 2024
b2b761e
correct names; improve skip filters
mcorino Aug 14, 2024
c0e6d47
correct skip filters
mcorino Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
23 changes: 4 additions & 19 deletions tools/scripts/cirrus/cirrus-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tools/scripts/cirrus/setup-opensuse-system-ruby.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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