From ba2a477e648513fac0183ae77990dfe16f890960 Mon Sep 17 00:00:00 2001 From: Euan Date: Sun, 18 Oct 2020 10:26:36 +0100 Subject: [PATCH] Fix FreeBSD build failures (#15613) The FreeBSD is/was failing, due to a conflict with installing Git. Git is guaranteed to be in the base image, so this removes that package from the package list. It also reverts back to the built-in `packages` tag since it's officially supported. Should the build fail in the future, the best place to go is the #sr.ht channel on freenode. --- .builds/freebsd.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index ef2e8f44d0715..6898a80fdc661 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -1,25 +1,19 @@ # see https://man.sr.ht/builds.sr.ht/compatibility.md#freebsd image: freebsd/latest - -# packages: -# - databases/sqlite3 -# - devel/boehm-gc-threaded -# - devel/pcre -# - devel/sdl20 -# - devel/sfml -# - www/node -# - devel/gmake -# - devel/git +packages: +- databases/sqlite3 +- devel/boehm-gc-threaded +- devel/pcre +- devel/sdl20 +- devel/sfml +- www/node +- devel/gmake sources: - https://github.com/nim-lang/Nim environment: CC: /usr/bin/clang tasks: - setup: | - # workaround https://github.com/timotheecour/Nim/issues/76 - sudo pkg update -q -f - sudo pkg install -y -q databases/sqlite3 devel/boehm-gc-threaded devel/pcre \ - devel/sdl20 devel/sfml www/node devel/gmake devel/git cd Nim git clone --depth 1 -q https://github.com/nim-lang/csources.git gmake -C csources -j $(sysctl -n hw.ncpu)