From 92ebbae4ceb87d49f75cff46fedf7c211d3904c1 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Tue, 9 Jun 2020 04:49:14 +1000 Subject: [PATCH 1/3] Make CirrusCI use a supported version of FreeBSD. --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 43f71da4..264c5d86 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -23,7 +23,7 @@ linux-x86_64-binaries_task: freebsd-x86_64-binaries_task: freebsd_instance: - image: freebsd-12-0-release-amd64 + image_family: freebsd-12-1 setup_script: - pkg install --yes gmake gdb gcc8 pkgconf sdl2 openal-soft gtksourceview2 libXv zip From f6d2645fd471a88fc174663939483aa2471f285d Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Tue, 9 Jun 2020 05:26:11 +1000 Subject: [PATCH 2/3] Apparently the MinGW compiler automatically appends the .exe extension now. --- .cirrus.yml | 2 +- bsnes/out/.gitignore | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 264c5d86..02204e3f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -58,7 +58,7 @@ windows-x86_64-binaries_task: - mkdir bsnes-nightly - mkdir bsnes-nightly/Database - mkdir bsnes-nightly/Firmware - - cp -a bsnes/out/bsnes bsnes-nightly/bsnes.exe + - cp -a bsnes/out/bsnes.exe bsnes-nightly/bsnes.exe - cp -a bsnes/Database/* bsnes-nightly/Database - cp -a shaders bsnes-nightly/Shaders - cp -a GPLv3.txt bsnes-nightly diff --git a/bsnes/out/.gitignore b/bsnes/out/.gitignore index b82f689c..1aeaff24 100644 --- a/bsnes/out/.gitignore +++ b/bsnes/out/.gitignore @@ -1 +1,2 @@ bsnes +bsnes.exe From 35598cf6226eb1c064f362835e0855cbbca3e900 Mon Sep 17 00:00:00 2001 From: Tim Allen Date: Tue, 9 Jun 2020 05:33:17 +1000 Subject: [PATCH 3/3] Prevent Debian packages from prompting for configuration. At some point the Debian tzdata package started waiting for somebody to tell it what timezone it was in, causing CI builds to timeout. --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 02204e3f..7c85a0bf 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ linux-x86_64-binaries_task: image: ubuntu:latest setup_script: - - apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev zip + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev zip compile_script: - make -C bsnes local=false @@ -49,7 +49,7 @@ windows-x86_64-binaries_task: image: ubuntu:latest setup_script: - - apt-get update && apt-get -y install build-essential mingw-w64 zip + - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential mingw-w64 zip compile_script: - make -C bsnes local=false platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"