[gjs: 1/3] CI: refactor Docker images creation
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 1/3] CI: refactor Docker images creation
- Date: Sat, 21 Jul 2018 02:20:19 +0000 (UTC)
commit a35e4ce675c488f0d2b2558eeb59151e17eee205
Author: Claudio André <claudioandre br gmail com>
Date: Fri Jul 20 21:21:50 2018 -0300
CI: refactor Docker images creation
- remove unneeded steps;
- don't mute installation logs;
- clean Fedora image better.
test/extra/do_basic.sh | 55 ++++++++++++++++++++-----------------------------
test/extra/do_docker.sh | 2 +-
2 files changed, 23 insertions(+), 34 deletions(-)
---
diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index de2ea820..ffaa686d 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -1,59 +1,48 @@
#!/bin/bash -e
-function do_Install_Base_Dependencies(){
+function do_Install_Dependencies(){
echo
echo '-- Installing Base Dependencies --'
if [[ $BASE == "debian" ]]; then
- apt-get update -qq
+ apt-get update
# Base dependencies
- apt-get -y -qq install build-essential git clang patch bison flex \
+ apt-get -y install build-essential git clang patch bison flex \
python-dev python3-dev \
autotools-dev autoconf gettext pkgconf autopoint yelp-tools \
docbook docbook-xsl libtext-csv-perl \
zlib1g-dev libdbus-glib-1-dev \
libtool libicu-dev libnspr4-dev \
- policykit-1 > /dev/null
+ policykit-1 \
+ libgtk-3-dev gir1.2-gtk-3.0 xvfb gnome-desktop-testing dbus-x11 dbus \
+ libedit-dev libgl1-mesa-dev lcov
elif [[ $BASE == "fedora" ]]; then
if [[ $STATIC == *"qemu"* ]]; then
- dnf -y -q --nogpgcheck upgrade
+ dnf -y --nogpgcheck upgrade
else
- dnf -y -q upgrade
+ dnf -y upgrade
fi
# Base dependencies
- dnf -y -q install @c-development @development-tools clang redhat-rpm-config gnome-common
python-devel \
- pygobject2 dbus-python perl-Text-CSV perl-XML-Parser gettext-devel gtk-doc
ninja-build \
- zlib-devel libffi-devel \
- libtool libicu-devel nspr-devel
- else
- echo
- echo '-- Error: invalid BASE code --'
- exit 1
- fi
-}
-
-function do_Install_Dependencies(){
- echo
- echo '-- Installing Dependencies --'
-
- if [[ $BASE == "debian" ]]; then
- # Testing dependencies
- apt-get -y -qq install libgtk-3-dev gir1.2-gtk-3.0 xvfb gnome-desktop-testing dbus-x11 dbus \
- libedit-dev libgl1-mesa-dev lcov > /dev/null
-
- elif [[ $BASE == "fedora" ]]; then
- # Testing dependencies
- dnf -y -q install gtk3 gtk3-devel gobject-introspection Xvfb gnome-desktop-testing dbus-x11 dbus \
- cairo intltool libxslt bison nspr zlib python3-devel dbus-glib libicu libffi pcre
libxml2 libxslt libtool flex \
+ dnf -y install @c-development @development-tools clang redhat-rpm-config gnome-common
python-devel \
+ pygobject2 dbus-python perl-Text-CSV perl-XML-Parser gettext-devel gtk-doc \
+ ninja-build zlib-devel libffi-devel \
+ libtool libicu-devel nspr-devel \
+ gtk3 gtk3-devel gobject-introspection Xvfb gnome-desktop-testing dbus-x11 dbus \
+ cairo intltool libxslt bison nspr zlib python3-devel dbus-glib libicu libffi pcre \
+ libxml2 libxslt libtool flex \
cairo-devel zlib-devel libffi-devel pcre-devel libxml2-devel libxslt-devel \
libedit-devel libasan libubsan libtsan compiler-rt lcov mesa-libGL-devel
if [[ $DEV == "devel" ]]; then
- dnf -y -q install time
+ dnf -y install time
fi
+ else
+ echo
+ echo '-- Error: invalid BASE code --'
+ exit 1
fi
}
@@ -63,11 +52,11 @@ function do_Install_Extras(){
if [[ $BASE == "debian" ]]; then
# Distros development versions of needed libraries
- apt-get -y -qq install libgirepository1.0-dev > /dev/null
+ apt-get -y install libgirepository1.0-dev
elif [[ $BASE == "fedora" ]]; then
# Distros development versions of needed libraries
- dnf -y -q install gobject-introspection-devel
+ dnf -y install gobject-introspection-devel
if [[ $STATIC != *"qemu"* ]]; then
# Distros debug info of needed libraries
diff --git a/test/extra/do_docker.sh b/test/extra/do_docker.sh
index 1566e59d..3930e3c9 100755
--- a/test/extra/do_docker.sh
+++ b/test/extra/do_docker.sh
@@ -12,13 +12,13 @@ function do_Shrink_Image(){
elif [[ $BASE == "fedora" ]]; then
dnf -y clean all
+ rm -rf /var/cache/dnf
fi
echo '-- Done --'
}
if [[ $1 == "BUILD_MOZ" ]]; then
- do_Install_Base_Dependencies
do_Install_Dependencies
do_Set_Env
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]