[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/10] travis: Run bootstrap instead of autogen.sh
From: |
Alexander Graf |
Subject: |
[PATCH v3 01/10] travis: Run bootstrap instead of autogen.sh |
Date: |
Tue, 4 Jun 2019 12:27:25 +0200 |
Commit 35b909062e7b3 ("gnulib: Upgrade Gnulib and switch to bootstrap tool")
changed the build flow from running ./autogen.sh to running ./bootstrap
but missed to update .travis.yml. Adapt it accordingly.
Fixes: 35b909062e7b3 ("gnulib: Upgrade Gnulib and switch to bootstrap tool")
Signed-off-by: Alexander Graf <address@hidden>
---
v1 -> v2:
- use local gnulib copy (saves ~3m git checkout time)
v2 -> v3:
- add comments to why we still use the system gnulib
---
.travis.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 81de20fa3..de8ff057a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ addons:
- python
- qemu-system
- unifont
+ - gnulib
env:
global:
@@ -35,7 +36,13 @@ before_script:
script:
# Comments must be outside the command strings below, or the Travis parser
# will get confused.
- - ./autogen.sh
+
+ # The Ubuntu gnulib does not compile with gcc8, so only use it with the
system compiler.
+ # For targets using the system compiler though (x86 currently), this trick
saves a few
+ # minutes on every compile run.
+ - if [ ! "$CROSS_TARGETS" ]; then rm -rf gnulib; ln -s /usr/share/gnulib; fi
+ # Initialize build system
+ - ./bootstrap
# Build all selected GRUB targets.
- for target in $GRUB_TARGETS; do
--
2.16.4
- [PATCH v3 00/10] Travis fixes, Alexander Graf, 2019/06/04
- [PATCH v3 02/10] travis: Fix sparc64 test, Alexander Graf, 2019/06/04
- [PATCH v3 03/10] travis: Fix mips QEMU target, Alexander Graf, 2019/06/04
- [PATCH v3 04/10] travis: Fix arm coreboot test and make loop more robus, Alexander Graf, 2019/06/04
- [PATCH v3 01/10] travis: Run bootstrap instead of autogen.sh,
Alexander Graf <=
- [PATCH v3 07/10] travis: Add ARM thumb target to tests, Alexander Graf, 2019/06/04
- [PATCH v3 05/10] arm coreboot: Use common directory path, Alexander Graf, 2019/06/04
- [PATCH v3 08/10] travis: Test module loading from tftp as well, Alexander Graf, 2019/06/04
- [PATCH v3 09/10] travis: Disable MIPS target, Alexander Graf, 2019/06/04
- Re: [PATCH v3 09/10] travis: Disable MIPS target, Daniel Kiper, 2019/06/04