gci: Format the build script

We were using a lot of docker conventions, which are not necessary in
the script itself.
This commit is contained in:
Christian Decker 2021-01-19 12:02:02 +01:00 committed by Rusty Russell
parent cd9aa267b4
commit 6119f1f5fb

View file

@ -163,9 +163,11 @@ jobs:
-r contrib/pyln-proto/requirements.txt \ -r contrib/pyln-proto/requirements.txt \
-r contrib/pyln-testing/requirements.txt -r contrib/pyln-testing/requirements.txt
# Install utilities that aren't dependencies, but make running # Install utilities that aren't dependencies, but make
# tests easier/feasible on CI # running tests easier/feasible on CI (and pytest which
pip3 install --user \ # keeps breaking the rerunfailures plugin).
pip3 install --user -U \
pytest==6.1.0 \
blinker \ blinker \
pytest-sentry \ pytest-sentry \
pytest-rerunfailures==9.1.1 \ pytest-rerunfailures==9.1.1 \
@ -194,30 +196,41 @@ jobs:
export STRIP="$TARGET_HOST"-strip export STRIP="$TARGET_HOST"-strip
export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static
wget -q https://zlib.net/zlib-1.2.11.tar.gz \ wget -q https://zlib.net/zlib-1.2.11.tar.gz
&& tar xf zlib-1.2.11.tar.gz \ tar xf zlib-1.2.11.tar.gz
&& cd zlib-1.2.11 \ cd zlib-1.2.11
&& ./configure --prefix="$QEMU_LD_PREFIX" \ ./configure --prefix="$QEMU_LD_PREFIX"
&& make \ make
&& sudo make install sudo make install
cd .. && rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11 cd ..
rm zlib-1.2.11.tar.gz && rm -rf zlib-1.2.11
wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip \ wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip
&& unzip -q sqlite-src-3260000.zip \ unzip -q sqlite-src-3260000.zip
&& cd sqlite-src-3260000 \ cd sqlite-src-3260000
&& automake --add-missing --force-missing --copy || true \ automake --add-missing --force-missing --copy || true
&& ./configure --disable-tcl --enable-static --disable-readline --disable-threadsafe --disable-load-extension --host="$TARGET_HOST" --prefix="$QEMU_LD_PREFIX" \ ./configure --disable-tcl \
&& make \ --enable-static \
&& sudo make install --disable-readline \
cd .. && rm sqlite-src-3260000.zip && rm -rf sqlite-src-3260000 --disable-threadsafe \
--disable-load-extension \
--host="$TARGET_HOST" \
--prefix="$QEMU_LD_PREFIX"
make
sudo make install
cd ..
rm sqlite-src-3260000.zip
rm -rf sqlite-src-3260000
wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz \ wget -q https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz
&& tar xf gmp-6.1.2.tar.xz \ tar xf gmp-6.1.2.tar.xz
&& cd gmp-6.1.2 \ cd gmp-6.1.2
&& ./configure --disable-assembly --prefix="$QEMU_LD_PREFIX" --host="$TARGET_HOST" \ ./configure --disable-assembly --prefix="$QEMU_LD_PREFIX" --host="$TARGET_HOST"
&& make \ make
&& sudo make install sudo make install
cd .. && rm gmp-6.1.2.tar.xz && rm -rf gmp-6.1.2 cd ..
rm gmp-6.1.2.tar.xz
rm -rf gmp-6.1.2
./configure CC="$TARGET_HOST-gcc" --enable-static ./configure CC="$TARGET_HOST-gcc" --enable-static