From f9a1e617f4475f1a3873b61862b6b9ec5d0136e0 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Mon, 23 Dec 2019 23:18:44 +0900 Subject: [PATCH 1/5] Add FreeBSD CI by Cirrus CI --- .cirrus.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .cirrus.yml diff --git a/.cirrus.yml b/.cirrus.yml new file mode 100644 index 00000000..afc50422 --- /dev/null +++ b/.cirrus.yml @@ -0,0 +1,17 @@ +FreeBSD_task: + freebsd_instance: + image: freebsd-12-1-release-amd64 + env: + ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation + prepare_script: + - pkg install openssl111 git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm + - git submodule update --init --recursive + configure_script: + - ./bootstrap + - env CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman + build_script: + - make -j $(sysctl -n hw.ncpu || echo 4) + install_script: + - make install + test_script: + - /usr/local/sbin/xrdp -v From 43f2b2290ec131e0dde3dc2265d9aaaa59888ab0 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Tue, 24 Dec 2019 00:30:17 +0900 Subject: [PATCH 2/5] FreeBSD CI: perform CI test on 12 and 11 --- .cirrus.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index afc50422..ce5e107a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,9 @@ FreeBSD_task: - freebsd_instance: - image: freebsd-12-1-release-amd64 + matrix: + freebsd_instance: + image: freebsd-12-1-release-amd64 + freebsd_instance: + image: freebsd-11-3-stable-amd64-v20191205 env: ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation prepare_script: From f11987ac0405fb1776b9027e19de28fc3069e3a1 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 2 Jan 2020 22:11:28 +0900 Subject: [PATCH 3/5] FreeBSD CI: use `pkg install -y` instead of ASSUME_YES --- .cirrus.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ce5e107a..6c261252 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,10 +4,8 @@ FreeBSD_task: image: freebsd-12-1-release-amd64 freebsd_instance: image: freebsd-11-3-stable-amd64-v20191205 - env: - ASSUME_ALWAYS_YES: TRUE # required for unattanded "pkg" invocation prepare_script: - - pkg install openssl111 git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm + - pkg install -y git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm - git submodule update --init --recursive configure_script: - ./bootstrap From 24ee0cfd788dbe658c2f2f390d7abfaa159816fc Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 2 Jan 2020 22:27:24 +0900 Subject: [PATCH 4/5] FreeBSD CI: use security/openssl after recent ports update See ports/UPDATING 20200101: https://svnweb.freebsd.org/ports/head/UPDATING?view=markup --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6c261252..e489ae66 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ FreeBSD_task: freebsd_instance: image: freebsd-11-3-stable-amd64-v20191205 prepare_script: - - pkg install -y git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm + - pkg install -y git openssl autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm - git submodule update --init --recursive configure_script: - ./bootstrap From 1c5a5e32a05b2a8e5bc96174833f404183e1b6ad Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 2 Jan 2020 22:39:12 +0900 Subject: [PATCH 5/5] FreeBSD CI: switch to image_family, build with multiple SSL library --- .cirrus.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index e489ae66..4ea22a59 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,11 +1,16 @@ FreeBSD_task: + matrix: + env: + SSL: openssl + env: + SSL: libressl matrix: freebsd_instance: - image: freebsd-12-1-release-amd64 + image_family: freebsd-12-1 freebsd_instance: - image: freebsd-11-3-stable-amd64-v20191205 + image_family: freebsd-11-3-snap prepare_script: - - pkg install -y git openssl autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm + - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm - git submodule update --init --recursive configure_script: - ./bootstrap