From 85f4ce448f56dd1ff20c1a0178366fdb913e1f1b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 4 Jan 2021 19:33:30 +0000 Subject: [PATCH] ci: Don't run autotools twice I started writing a comment about why we run autotools twice, then decided that was *much* uglier than extracting the binding rules to a separate `Makefile`. But I forgot to go back and remove the first part, so do that now and fix up the comment. --- .cci.jenkinsfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index cda3a7a9..930f52c7 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -14,13 +14,7 @@ parallel rpms: { export PATH="\$HOME/.cargo/bin:\$PATH" # Our primary CI build goes via RPM rather than direct to binaries # to better test that path, including our vendored spec file, etc. - # However, to do that we need to generate - # the source code expected via the RPM path. Because the binding - # build rules are part of an Automake-generated Makefile we end - # up running autotools twice, which is annoying but extracting - # - env NOCONFIGURE=1 ./autogen.sh - ./configure --prefix=/usr + # The RPM build expects pre-generated bindings, so do that now. make -f Makefile.bindings bindings cd packaging make -f Makefile.dist-packaging rpm