[libvirt PATCH 0/2] ci: Build on macOS 11
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/256476242 Andrea Bolognani (2): ci: Update package list on Cirrus CI ci: Build on macOS 11 instead of macOS 10.15 .gitlab-ci.yml | 10 +++++++--- ci/cirrus/build.yml | 1 + ci/cirrus/{macos-1015.vars => macos-11.vars} | 0 3 files changed, 8 insertions(+), 3 deletions(-) rename ci/cirrus/{macos-1015.vars => macos-11.vars} (100%) -- 2.26.2
While pkgng on FreeBSD updates the package list automatically when it's run, homebrew on macOS doesn't do the same thing, which can result in stale packages being installed. Explicitly call 'brew update' before 'brew install' to avoid that scenario. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .gitlab-ci.yml | 4 ++++ ci/cirrus/build.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4563bccdf1..0f609cd8c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,7 @@ stages: -e "s|[@]CIRRUS_VM_INSTANCE_TYPE@|$CIRRUS_VM_INSTANCE_TYPE|g" -e "s|[@]CIRRUS_VM_IMAGE_SELECTOR@|$CIRRUS_VM_IMAGE_SELECTOR|g" -e "s|[@]CIRRUS_VM_IMAGE_NAME@|$CIRRUS_VM_IMAGE_NAME|g" + -e "s|[@]UPDATE_COMMAND@|$UPDATE_COMMAND|g" -e "s|[@]INSTALL_COMMAND@|$INSTALL_COMMAND|g" -e "s|[@]PATH@|$PATH_EXTRA${PATH_EXTRA:+:}\$PATH|g" -e "s|[@]PKG_CONFIG_PATH@|$PKG_CONFIG_PATH|g" @@ -410,6 +411,7 @@ x64-freebsd-11-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-11-4 + UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y x64-freebsd-12-build: @@ -419,6 +421,7 @@ x64-freebsd-12-build: CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family CIRRUS_VM_IMAGE_NAME: freebsd-12-2 + UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y x64-macos-1015-build: @@ -428,6 +431,7 @@ x64-macos-1015-build: CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_IMAGE_NAME: catalina-base + UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 3ca88b265b..a6b13b947c 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -12,6 +12,7 @@ env: build_task: install_script: + - @UPDATE_COMMAND@ - @INSTALL_COMMAND@ @PKGS@ - if test -n "@PYPI_PKGS@" ; then @PIP3@ install @PYPI_PKGS@ ; fi clone_script: -- 2.26.2
macOS builder capacity on Cirrus CI is quite limited, and so we can't afford to keep the old build job around after adding the new one like we do for FreeBSD. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .gitlab-ci.yml | 6 +++--- ci/cirrus/{macos-1015.vars => macos-11.vars} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename ci/cirrus/{macos-1015.vars => macos-11.vars} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f609cd8c7..81a4e80fd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -424,13 +424,13 @@ x64-freebsd-12-build: UPDATE_COMMAND: pkg update INSTALL_COMMAND: pkg install -y -x64-macos-1015-build: +x64-macos-11-build: extends: .cirrus_build_job variables: - NAME: macos-1015 + NAME: macos-11 CIRRUS_VM_INSTANCE_TYPE: osx_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: catalina-base + CIRRUS_VM_IMAGE_NAME: big-sur-base UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin diff --git a/ci/cirrus/macos-1015.vars b/ci/cirrus/macos-11.vars similarity index 100% rename from ci/cirrus/macos-1015.vars rename to ci/cirrus/macos-11.vars -- 2.26.2
On a Monday in 2021, Andrea Bolognani wrote:
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/256476242
Andrea Bolognani (2): ci: Update package list on Cirrus CI ci: Build on macOS 11 instead of macOS 10.15
.gitlab-ci.yml | 10 +++++++--- ci/cirrus/build.yml | 1 + ci/cirrus/{macos-1015.vars => macos-11.vars} | 0 3 files changed, 8 insertions(+), 3 deletions(-) rename ci/cirrus/{macos-1015.vars => macos-11.vars} (100%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Andrea Bolognani -
Ján Tomko