diff mbox series

[3/3] cirrus: delete FreeBSD and macOS jobs

Message ID 20210625172211.451010-4-berrange@redhat.com
State New
Headers show
Series ci: use cirrus-run to utilize Cirrus CI from GitLab CI | expand

Commit Message

Daniel P. Berrangé June 25, 2021, 5:22 p.m. UTC
The builds for these two platforms can now be performed from GitLab CI
using cirrus-run.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .cirrus.yml | 55 -----------------------------------------------------
 1 file changed, 55 deletions(-)

Comments

Thomas Huth June 28, 2021, 7:29 a.m. UTC | #1
On 25/06/2021 19.22, Daniel P. Berrangé wrote:
> The builds for these two platforms can now be performed from GitLab CI
> using cirrus-run.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   .cirrus.yml | 55 -----------------------------------------------------
>   1 file changed, 55 deletions(-)
> 
> diff --git a/.cirrus.yml b/.cirrus.yml
> index f4bf49b704..02c43a074a 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -1,61 +1,6 @@
>   env:
>     CIRRUS_CLONE_DEPTH: 1
>   
> -freebsd_12_task:
> -  freebsd_instance:
> -    image_family: freebsd-12-2
> -    cpu: 8
> -    memory: 8G
> -  install_script:
> -    - ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
> -    - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
> -          nettle perl5 pixman pkgconf png usbredir ninja
> -  script:
> -    - mkdir build
> -    - cd build
> -    # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
> -    # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
> -    - ../configure --enable-werror --disable-gnutls
> -      || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - gmake -j$(sysctl -n hw.ncpu)
> -    - gmake -j$(sysctl -n hw.ncpu) check V=1
> -
> -macos_task:
> -  osx_instance:
> -    image: catalina-base
> -  install_script:
> -    - brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
> -  script:
> -    - mkdir build
> -    - cd build
> -    - ../configure --python=/usr/local/bin/python3 --enable-werror
> -                   --extra-cflags='-Wno-error=deprecated-declarations'
> -                   || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - gmake -j$(sysctl -n hw.ncpu)
> -    - gmake check-unit V=1
> -    - gmake check-block V=1
> -    - gmake check-qapi-schema V=1
> -    - gmake check-softfloat V=1
> -    - gmake check-qtest-x86_64 V=1
> -
> -macos_xcode_task:
> -  osx_instance:
> -    # this is an alias for the latest Xcode
> -    image: catalina-xcode
> -  install_script:
> -    - brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
> -  script:
> -    - mkdir build
> -    - cd build
> -    - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules
> -                   --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - gmake -j$(sysctl -n hw.ncpu)
> -    - gmake check-unit V=1
> -    - gmake check-block V=1
> -    - gmake check-qapi-schema V=1
> -    - gmake check-softfloat V=1
> -    - gmake check-qtest-x86_64 V=1
> -
>   windows_msys2_task:
>     timeout_in: 90m
>     windows_container:
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>
Wainer dos Santos Moschetta June 30, 2021, 7 p.m. UTC | #2
On 6/25/21 2:22 PM, Daniel P. Berrangé wrote:
> The builds for these two platforms can now be performed from GitLab CI
> using cirrus-run.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   .cirrus.yml | 55 -----------------------------------------------------
>   1 file changed, 55 deletions(-)

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index f4bf49b704..02c43a074a 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -1,61 +1,6 @@
>   env:
>     CIRRUS_CLONE_DEPTH: 1
>   
> -freebsd_12_task:
> -  freebsd_instance:
> -    image_family: freebsd-12-2
> -    cpu: 8
> -    memory: 8G
> -  install_script:
> -    - ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
> -    - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
> -          nettle perl5 pixman pkgconf png usbredir ninja
> -  script:
> -    - mkdir build
> -    - cd build
> -    # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
> -    # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
> -    - ../configure --enable-werror --disable-gnutls
> -      || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - gmake -j$(sysctl -n hw.ncpu)
> -    - gmake -j$(sysctl -n hw.ncpu) check V=1
> -
> -macos_task:
> -  osx_instance:
> -    image: catalina-base
> -  install_script:
> -    - brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
> -  script:
> -    - mkdir build
> -    - cd build
> -    - ../configure --python=/usr/local/bin/python3 --enable-werror
> -                   --extra-cflags='-Wno-error=deprecated-declarations'
> -                   || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - gmake -j$(sysctl -n hw.ncpu)
> -    - gmake check-unit V=1
> -    - gmake check-block V=1
> -    - gmake check-qapi-schema V=1
> -    - gmake check-softfloat V=1
> -    - gmake check-qtest-x86_64 V=1
> -
> -macos_xcode_task:
> -  osx_instance:
> -    # this is an alias for the latest Xcode
> -    image: catalina-xcode
> -  install_script:
> -    - brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
> -  script:
> -    - mkdir build
> -    - cd build
> -    - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules
> -                   --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }
> -    - gmake -j$(sysctl -n hw.ncpu)
> -    - gmake check-unit V=1
> -    - gmake check-block V=1
> -    - gmake check-qapi-schema V=1
> -    - gmake check-softfloat V=1
> -    - gmake check-qtest-x86_64 V=1
> -
>   windows_msys2_task:
>     timeout_in: 90m
>     windows_container:
Willian Rampazzo June 30, 2021, 8:52 p.m. UTC | #3
On Fri, Jun 25, 2021 at 2:22 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> The builds for these two platforms can now be performed from GitLab CI
> using cirrus-run.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  .cirrus.yml | 55 -----------------------------------------------------
>  1 file changed, 55 deletions(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff mbox series

Patch

diff --git a/.cirrus.yml b/.cirrus.yml
index f4bf49b704..02c43a074a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,61 +1,6 @@ 
 env:
   CIRRUS_CLONE_DEPTH: 1
 
-freebsd_12_task:
-  freebsd_instance:
-    image_family: freebsd-12-2
-    cpu: 8
-    memory: 8G
-  install_script:
-    - ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
-    - pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
-          nettle perl5 pixman pkgconf png usbredir ninja
-  script:
-    - mkdir build
-    - cd build
-    # TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
-    # See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
-    - ../configure --enable-werror --disable-gnutls
-      || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - gmake -j$(sysctl -n hw.ncpu)
-    - gmake -j$(sysctl -n hw.ncpu) check V=1
-
-macos_task:
-  osx_instance:
-    image: catalina-base
-  install_script:
-    - brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
-  script:
-    - mkdir build
-    - cd build
-    - ../configure --python=/usr/local/bin/python3 --enable-werror
-                   --extra-cflags='-Wno-error=deprecated-declarations'
-                   || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - gmake -j$(sysctl -n hw.ncpu)
-    - gmake check-unit V=1
-    - gmake check-block V=1
-    - gmake check-qapi-schema V=1
-    - gmake check-softfloat V=1
-    - gmake check-qtest-x86_64 V=1
-
-macos_xcode_task:
-  osx_instance:
-    # this is an alias for the latest Xcode
-    image: catalina-xcode
-  install_script:
-    - brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
-  script:
-    - mkdir build
-    - cd build
-    - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules
-                   --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }
-    - gmake -j$(sysctl -n hw.ncpu)
-    - gmake check-unit V=1
-    - gmake check-block V=1
-    - gmake check-qapi-schema V=1
-    - gmake check-softfloat V=1
-    - gmake check-qtest-x86_64 V=1
-
 windows_msys2_task:
   timeout_in: 90m
   windows_container: