Commit 688a79b4 authored by Vivien Kraus's avatar Vivien Kraus
Browse files

Run git-check in a Guix environment

parent be048e5c
......@@ -77,12 +77,7 @@ sh autogen.sh VALAFLAGS="--target-glib=2.50" || exit 1
--enable-silent-rules=yes \
|| (cat config.log ; exit 1) \
|| exit 1
(cd lib && make -j 16) || exit 1
make -j 16 CFLAGS="$CFLAGS -Werror" safe || exit 1
make -j 16 CFLAGS="$CFLAGS -Werror" distcheck || exit 1
make -j 8 CFLAGS="$CFLAGS -Werror" check || exit 1
make -j 16 CFLAGS="$CFLAGS -Werror" install install-html || exit 1
make -j 8 git-check || exit 1
make -j git-check || exit 1
cd $SOURCE_TOP || exit 1
mkdir -p $SOURCE_TOP/dist || exit 1
cp $SOURCE_TOP/.version \
......
......@@ -95,6 +95,11 @@ AM_MISSING_PROG([FLATPAK_BUILDER], [flatpak-builder])
AC_ARG_VAR([FLATPAK_BUILDERFLAGS], [Additional flags to pass to flatpak-builder (such as --install, --gpg-sign=key...), but not --repo since we already build for the repo under tarot-flatpak in the build directory.])
AM_MISSING_PROG([GIT], [git])
AM_MISSING_PROG([DIFF], [diff])
AC_PATH_PROG([GUIX], [guix], [no])
AS_IF([test "x$GUIX" != "xno"], [
AC_SUBST([GUIX])
])
AM_CONDITIONAL([HAVE_GUIX], [test "x$GUIX" != "xno"])
# Checks for libraries.
gl_INIT
......
......@@ -21,7 +21,7 @@
#+options: ':t toc:t author:t email:t
#+language: en
#+macro: updated {{{date}}}
#+macro: updated (eval (shell-command-to-string "echo -n $(date +%Y-%m-%d)"))
#+macro: version (eval (package-version))
#+texinfo_filename: tarot.info
......
......@@ -20,6 +20,10 @@ git_clone_verbose = $(git_clone_verbose_@AM_V@)
git_clone_verbose_ = $(git_clone_verbose_@AM_DEFAULT_V@)
git_clone_verbose_0 = @echo " GIT CLONE";
if HAVE_GUIX
CI_ENV = $(GUIX) environment --ad-hoc autoconf autoconf-archive automake gettext gcc-toolchain curl check emacs git gtk+ indent help2man jq cairo gobject-introspection glib gtk+ libtool libxml2 make nettle emacs-org pkg-config r-ggplot2 r-glmnet r-optparse texinfo texlive vala valgrind wget libxslt --
endif
git-check:
@$(MKDIR_P) .gitcheck ; chmod -R u+w .gitcheck
@rm -rf .gitcheck
......@@ -32,13 +36,13 @@ git-check:
done)
$(git_clone_verbose) $(GIT) clone $(srcdir) .gitcheck/source/
$(MKDIR_P) .gitcheck/build
(cd .gitcheck/source && ./autogen.sh)
(cd .gitcheck/build && ../../.gitcheck/source/configure VALAFLAGS="--target-glib=2.50")
$(MAKE) $(AM_MAKEFLAGS) -C .gitcheck/build safe
$(MAKE) $(AM_MAKEFLAGS) -C .gitcheck/build all
$(MAKE) $(AM_MAKEFLAGS) -C .gitcheck/build check distcheck
$(MAKE) $(AM_MAKEFLAGS) -C .gitcheck/build indent
$(MAKE) $(AM_MAKEFLAGS) distdir
(cd .gitcheck/source && $(CI_ENV) ./autogen.sh)
(cd .gitcheck/build && $(CI_ENV) ../source/configure VALAFLAGS="--target-glib=2.50" CFLAGS="-Wall -Wextra -g" --enable-valgrind=yes --enable-silent-rules=yes)
(cd .gitcheck/build && $(CI_ENV) $(MAKE) $(AM_MAKEFLAGS) safe)
(cd .gitcheck/build && $(CI_ENV) $(MAKE) $(AM_MAKEFLAGS) all)
(cd .gitcheck/build && $(CI_ENV) $(MAKE) $(AM_MAKEFLAGS) check distcheck)
(cd .gitcheck/build && $(CI_ENV) $(MAKE) $(AM_MAKEFLAGS) indent)
@cp .gitcheck/build/tarot-*.tar.gz .
(cd .gitcheck/clean \
&& for source in $$(find . -type f | grep -v '/.git/') ; \
do \
......@@ -90,7 +94,7 @@ git-check:
fi;; \
esac ; \
done)
$(MAKE) $(AM_MAKEFLAGS) -C .gitcheck/build maintainer-clean
(cd .gitcheck/build && $(CI_ENV) $(MAKE) $(AM_MAKEFLAGS) maintainer-clean)
(cd .gitcheck/source \
&& for source in $$(find . -type f | grep -v '/.git/') ; \
do \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment