From f6b1dd176aaab29789be67b15c12f19fc6ba9fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 14 Oct 2024 19:59:50 +0100 Subject: targets: drop all macOS versions except 14 (Sonoma) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you run Cirrus CI macOS jobs using any image except for 'macos-runner:sonoma' it will now ignore your requested image and use this one instead. This is a recent change made by Cirrus CI to stop allowing a free choice of image. To some degree using multiple macOS versions was redundant. Most of the dependencies are obtained from HomeBrew, getting the same content regardless of macOS version. The base OS image provides the XCode toolchain, which does impact the app build process. The Sonoma image contains multiple XCode versions if apps desire to test broader compatibility than the default XCode version. Signed-off-by: Daniel P. Berrangé --- examples/manifest.yml | 2 - lcitool/facts/targets/macos-13.yml | 27 ---- lcitool/facts/targets/macos-14.yml | 2 +- lcitool/facts/targets/macos-15.yml | 27 ---- tests/data/manifest/in/manifest.yml | 5 - tests/data/manifest/out/ci/cirrus/macos-13.vars | 10 -- tests/data/manifest/out/ci/gitlab/builds.yml | 17 +-- tests/data/packages/out/macos-13.yml | 173 ------------------------ tests/data/packages/out/macos-15.yml | 173 ------------------------ tests/test_manifest.py | 1 - 10 files changed, 2 insertions(+), 435 deletions(-) delete mode 100644 lcitool/facts/targets/macos-13.yml delete mode 100644 lcitool/facts/targets/macos-15.yml delete mode 100644 tests/data/manifest/out/ci/cirrus/macos-13.vars delete mode 100644 tests/data/packages/out/macos-13.yml delete mode 100644 tests/data/packages/out/macos-15.yml diff --git a/examples/manifest.yml b/examples/manifest.yml index f6fb7ca..278f222 100644 --- a/examples/manifest.yml +++ b/examples/manifest.yml @@ -158,8 +158,6 @@ targets: freebsd-current: x86_64 - macos-13: aarch64 - macos-14: aarch64 opensuse-leap-15: diff --git a/lcitool/facts/targets/macos-13.yml b/lcitool/facts/targets/macos-13.yml deleted file mode 100644 index f509fc9..0000000 --- a/lcitool/facts/targets/macos-13.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -os: - name: 'MacOS' - version: '13' - -packaging: - format: 'brew' - command: 'brew' - -paths: - bash: /opt/homebrew/bin/bash - cc: /usr/bin/clang - ccache: /opt/homebrew/bin/ccache - make: /opt/homebrew/bin/gmake - ninja: /opt/homebrew/bin/ninja - pip3: /opt/homebrew/bin/pip3 - python: /opt/homebrew/bin/python3 - sudoers: /etc/sudoers - -ansible_python_package: python3 -ansible_python_interpreter: /opt/homebrew/bin/python3 - -cirrus: - instance_type: macos_instance - image_selector: image - image_name: ghcr.io/cirruslabs/macos-ventura-base:latest - arch: aarch64 diff --git a/lcitool/facts/targets/macos-14.yml b/lcitool/facts/targets/macos-14.yml index 49413d8..48bf86b 100644 --- a/lcitool/facts/targets/macos-14.yml +++ b/lcitool/facts/targets/macos-14.yml @@ -23,5 +23,5 @@ ansible_python_interpreter: /opt/homebrew/bin/python3 cirrus: instance_type: macos_instance image_selector: image - image_name: ghcr.io/cirruslabs/macos-sonoma-base:latest + image_name: ghcr.io/cirruslabs/macos-runner:sonoma arch: aarch64 diff --git a/lcitool/facts/targets/macos-15.yml b/lcitool/facts/targets/macos-15.yml deleted file mode 100644 index 941c071..0000000 --- a/lcitool/facts/targets/macos-15.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -os: - name: 'MacOS' - version: '15' - -packaging: - format: 'brew' - command: 'brew' - -paths: - bash: /opt/homebrew/bin/bash - cc: /usr/bin/clang - ccache: /opt/homebrew/bin/ccache - make: /opt/homebrew/bin/gmake - ninja: /opt/homebrew/bin/ninja - pip3: /opt/homebrew/bin/pip3 - python: /opt/homebrew/bin/python3 - sudoers: /etc/sudoers - -ansible_python_package: python3 -ansible_python_interpreter: /opt/homebrew/bin/python3 - -cirrus: - instance_type: macos_instance - image_selector: image - image_name: ghcr.io/cirruslabs/macos-sequoia-base:latest - arch: aarch64 diff --git a/tests/data/manifest/in/manifest.yml b/tests/data/manifest/in/manifest.yml index 095690c..d896d6f 100644 --- a/tests/data/manifest/in/manifest.yml +++ b/tests/data/manifest/in/manifest.yml @@ -46,9 +46,4 @@ targets: freebsd-current: x86_64 - macos-13: - jobs: - - arch: aarch64 - builds: false - macos-14: aarch64 diff --git a/tests/data/manifest/out/ci/cirrus/macos-13.vars b/tests/data/manifest/out/ci/cirrus/macos-13.vars deleted file mode 100644 index b2c5492..0000000 --- a/tests/data/manifest/out/ci/cirrus/macos-13.vars +++ /dev/null @@ -1,10 +0,0 @@ -CCACHE='/opt/homebrew/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/opt/homebrew/bin/gmake' -NINJA='/opt/homebrew/bin/ninja' -PACKAGING_COMMAND='brew' -PIP3='/opt/homebrew/bin/pip3' -PKGS='ccache git golang pkg-config' -PYPI_PKGS='' -PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/data/manifest/out/ci/gitlab/builds.yml b/tests/data/manifest/out/ci/gitlab/builds.yml index 5ef8913..754d07a 100644 --- a/tests/data/manifest/out/ci/gitlab/builds.yml +++ b/tests/data/manifest/out/ci/gitlab/builds.yml @@ -108,27 +108,12 @@ x86_64-freebsd-current: UPGRADE_COMMAND: pkg upgrade -y -aarch64-macos-13: - extends: .cirrus_build_job - needs: [] - allow_failure: false - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - JOB_OPTIONAL: 1 - NAME: macos-13 - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade - - aarch64-macos-14: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install diff --git a/tests/data/packages/out/macos-13.yml b/tests/data/packages/out/macos-13.yml deleted file mode 100644 index 178a291..0000000 --- a/tests/data/packages/out/macos-13.yml +++ /dev/null @@ -1,173 +0,0 @@ -cpan: -- Archive::Tar -- CPAN::Changes -- Digest -- Digest::MD5 -- ExtUtils::CBuilder -- ExtUtils::Embed -- File::Slurp -- IO::Compress::Bzip2 -- IO::Interface -- IO::String -- LWP::UserAgent -- Module::Build -- Net::OpenSSH -- Net::SNMP -- NetAddr::IP -- Sub::Uplevel -- TAP::Formatter::HTML -- TAP::Formatter::JUnit -- TAP::Harness::Archive -- Test::Exception -- Test::Harness -- Test::Pod -- Test::Pod::Coverage -- Test::Simple -- Time::HiRes -- XML::Twig -- XML::Writer -- XML::XPath -- YAML -- accessors -native: -- ant -- augeas -- autoconf -- automake -- awk -- bash -- bash-completion -- bc -- bindgen -- bison -- black -- bzip2 -- capstone -- ccache -- cdrtools -- check -- cmocka -- codespell -- cpanminus -- cppi -- ctags -- curl -- dbus -- diffutils -- dnsmasq -- docutils -- dtc -- e2fsprogs -- expect -- flake8 -- flex -- gcovr -- gdb -- gdk-pixbuf -- gettext -- git -- glib -- gnu-sed -- gnutls -- gobject-introspection -- golang -- grep -- gtk+3 -- gtk-doc -- gtk-vnc -- gzip -- icoutils -- intltool -- jemalloc -- jpeg-turbo -- jq -- json-c -- json-glib -- libarchive -- libcbor -- libconfig -- libepoxy -- libev -- libffi -- libgcrypt -- libiscsi -- libnfs -- libpcap -- libpng -- librest -- libslirp -- libsoup -- libssh -- libssh2 -- libtasn1 -- libtool -- libusb -- libvirt -- libvirt-glib -- libxml2 -- libxslt -- llvm -- lsof -- lua -- lzo -- make -- meson -- mtools -- ncurses -- net-snmp -- nettle -- ninja -- ocaml -- ocaml-findlib -- openjdk -- perl -- pixman -- pkg-config -- python-build -- python3 -- qemu -- readline -- rpm2cpio -- ruby -- rust -- screen -- scrub -- sdl2 -- sdl2_image -- snappy -- socat -- sparse -- spice-gtk -- spice-protocol -- swtpm -- tcl-tk -- tcpdump -- tesseract -- texinfo -- unzip -- usbredir -- vala -- vde -- vim -- vte3 -- wget -- xorriso -- xz -- yajl -- zip -- zlib -- zstd -pypi: -- PyGObject -- PyYAML -- boto3 -- dbus-python -- libxml2-python3 -- lxml -- numpy -- pillow -- pytest -- requests -- sphinx -- sphinx-rtd-theme -- tomli diff --git a/tests/data/packages/out/macos-15.yml b/tests/data/packages/out/macos-15.yml deleted file mode 100644 index 178a291..0000000 --- a/tests/data/packages/out/macos-15.yml +++ /dev/null @@ -1,173 +0,0 @@ -cpan: -- Archive::Tar -- CPAN::Changes -- Digest -- Digest::MD5 -- ExtUtils::CBuilder -- ExtUtils::Embed -- File::Slurp -- IO::Compress::Bzip2 -- IO::Interface -- IO::String -- LWP::UserAgent -- Module::Build -- Net::OpenSSH -- Net::SNMP -- NetAddr::IP -- Sub::Uplevel -- TAP::Formatter::HTML -- TAP::Formatter::JUnit -- TAP::Harness::Archive -- Test::Exception -- Test::Harness -- Test::Pod -- Test::Pod::Coverage -- Test::Simple -- Time::HiRes -- XML::Twig -- XML::Writer -- XML::XPath -- YAML -- accessors -native: -- ant -- augeas -- autoconf -- automake -- awk -- bash -- bash-completion -- bc -- bindgen -- bison -- black -- bzip2 -- capstone -- ccache -- cdrtools -- check -- cmocka -- codespell -- cpanminus -- cppi -- ctags -- curl -- dbus -- diffutils -- dnsmasq -- docutils -- dtc -- e2fsprogs -- expect -- flake8 -- flex -- gcovr -- gdb -- gdk-pixbuf -- gettext -- git -- glib -- gnu-sed -- gnutls -- gobject-introspection -- golang -- grep -- gtk+3 -- gtk-doc -- gtk-vnc -- gzip -- icoutils -- intltool -- jemalloc -- jpeg-turbo -- jq -- json-c -- json-glib -- libarchive -- libcbor -- libconfig -- libepoxy -- libev -- libffi -- libgcrypt -- libiscsi -- libnfs -- libpcap -- libpng -- librest -- libslirp -- libsoup -- libssh -- libssh2 -- libtasn1 -- libtool -- libusb -- libvirt -- libvirt-glib -- libxml2 -- libxslt -- llvm -- lsof -- lua -- lzo -- make -- meson -- mtools -- ncurses -- net-snmp -- nettle -- ninja -- ocaml -- ocaml-findlib -- openjdk -- perl -- pixman -- pkg-config -- python-build -- python3 -- qemu -- readline -- rpm2cpio -- ruby -- rust -- screen -- scrub -- sdl2 -- sdl2_image -- snappy -- socat -- sparse -- spice-gtk -- spice-protocol -- swtpm -- tcl-tk -- tcpdump -- tesseract -- texinfo -- unzip -- usbredir -- vala -- vde -- vim -- vte3 -- wget -- xorriso -- xz -- yajl -- zip -- zlib -- zstd -pypi: -- PyGObject -- PyYAML -- boto3 -- dbus-python -- libxml2-python3 -- lxml -- numpy -- pillow -- pytest -- requests -- sphinx -- sphinx-rtd-theme -- tomli diff --git a/tests/test_manifest.py b/tests/test_manifest.py index 35b6916..8a52b7b 100644 --- a/tests/test_manifest.py +++ b/tests/test_manifest.py @@ -111,7 +111,6 @@ def test_generate(assert_equal, targets, packages, projects, monkeypatch): Path("ci", "gitlab", "builds.yml"), Path("ci", "gitlab", "sanity-checks.yml"), Path("ci", "cirrus", "freebsd-current.vars"), - Path("ci", "cirrus", "macos-13.vars"), Path("ci", "cirrus", "macos-14.vars"), Path("ci", "containers", "centos-stream-9.Dockerfile"), Path("ci", "containers", "fedora-rawhide.Dockerfile"), -- cgit v1.1