From 21cb62447c3af902a86df0a6f1a888a12491e42e Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Thu, 18 Apr 2019 21:54:51 +0200 Subject: Use Dockerfiles for Windows and Linux test environments --- .cirrus.yml | 93 ++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 22 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 0507bcf4..770d70a5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,25 +2,58 @@ env: CIRRUS_CLONE_DEPTH: 1 ARCH: amd64 -main_task: +FreeBSD_task: + matrix: + env: + BS: autotools + env: + BS: cmake matrix: - container: - image: fedora:29 freebsd_instance: image: freebsd-12-0-release-amd64 freebsd_instance: image: freebsd-11-2-release-amd64 + prepare_script: + - ./build/ci/cirrus_ci/ci.sh prepare + configure_script: + - ./build/ci/build.sh -a autogen + - ./build/ci/build.sh -a configure + build_script: + - ./build/ci/build.sh -a build + test_script: + - ./build/ci/build.sh -a test + - ./build/ci/cirrus_ci/ci.sh test + +MacOS_task: + matrix: + env: + BS: autotools + env: + BS: cmake + matrix: osx_instance: image: mojave-xcode-10.2 osx_instance: image: high-sierra-xcode-10.0 + prepare_script: + - ./build/ci/cirrus_ci/ci.sh prepare + configure_script: + - ./build/ci/build.sh -a autogen + - ./build/ci/build.sh -a configure + build_script: + - ./build/ci/build.sh -a build + test_script: + - ./build/ci/build.sh -a test + - ./build/ci/cirrus_ci/ci.sh test + +Fedora_29_task: + container: + dockerfile: build/ci/cirrus_ci/Dockerfile.fedora29 matrix: env: BS: autotools env: BS: cmake - prepare_script: - - ./build/ci/cirrus_ci.sh prepare configure_script: - ./build/ci/build.sh -a autogen - ./build/ci/build.sh -a configure @@ -28,26 +61,42 @@ main_task: - ./build/ci/build.sh -a build test_script: - ./build/ci/build.sh -a test - - ./build/ci/cirrus_ci.sh test -Windows_task: +Windows_MSVC_task: windows_container: - image: cirrusci/windowsservercore:2019 + dockerfile: build/ci/cirrus_ci/Dockerfile.msvc os_version: 2019 - matrix: - env: - BE: mingw-gcc - env: - BE: cygwin-gcc - env: - BE: msvc - prepare_script: - - build\ci\cirrus_ci.cmd prepare - deplibs_script: - - build\ci\cirrus_ci.cmd deplibs + env: + BE: msvc + configure_script: + - build\ci\cirrus_ci\ci.cmd configure + build_script: + - build\ci\cirrus_ci\ci.cmd build + test_script: + - build\ci\cirrus_ci\ci.cmd test + +Windows_MinGW_task: + windows_container: + dockerfile: build/ci/cirrus_ci/Dockerfile.mingw + os_version: 2019 + env: + BE: mingw-gcc + configure_script: + - build\ci\cirrus_ci\ci.cmd configure + build_script: + - build\ci\cirrus_ci\ci.cmd build + test_script: + - build\ci\cirrus_ci\ci.cmd test + +Windows_Cygwin_task: + windows_container: + dockerfile: build/ci/cirrus_ci/Dockerfile.cygwin + os_version: 2019 + env: + BE: cygwin-gcc configure_script: - - build\ci\cirrus_ci.cmd configure + - build\ci\cirrus_ci\ci.cmd configure build_script: - - build\ci\cirrus_ci.cmd build + - build\ci\cirrus_ci\ci.cmd build test_script: - - build\ci\cirrus_ci.cmd test + - build\ci\cirrus_ci\ci.cmd test -- cgit v1.2.1