diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2019-09-20 00:56:12 +0000 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2019-09-20 00:56:12 +0000 |
| commit | be50074e4d07e118636c1187e8654e08dff52ab4 (patch) | |
| tree | 220f08a6f81466b38f0d96d5c8e95667b12b9542 /test/extra/do_docker.sh | |
| parent | cb5139185724e947a5afda9f185a5fc33699d333 (diff) | |
| parent | bfb7de0d381fa774d158e05960e3d57cb72b87f3 (diff) | |
| download | gjs-be50074e4d07e118636c1187e8654e08dff52ab4.tar.gz | |
Merge branch 'smaller-ci-phase1' into 'master'
Smaller CI, phase 1
See merge request GNOME/gjs!339
Diffstat (limited to 'test/extra/do_docker.sh')
| -rwxr-xr-x | test/extra/do_docker.sh | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/test/extra/do_docker.sh b/test/extra/do_docker.sh index 3930e3c9..b92c9899 100755 --- a/test/extra/do_docker.sh +++ b/test/extra/do_docker.sh @@ -6,14 +6,8 @@ function do_Shrink_Image(){ PATH=$PATH:~/.local/bin rm -rf ~/jhbuild/install/lib/libjs_static.ajs - if [[ $BASE == "ubuntu" ]]; then - apt-get -y clean - rm -rf /var/lib/apt/lists/* - - elif [[ $BASE == "fedora" ]]; then - dnf -y clean all - rm -rf /var/cache/dnf - fi + dnf -y clean all + rm -rf /var/cache/dnf echo '-- Done --' } @@ -21,18 +15,8 @@ function do_Shrink_Image(){ if [[ $1 == "BUILD_MOZ" ]]; then do_Install_Dependencies do_Set_Env - - if [[ $DEV == "devel" ]]; then - do_Install_Extras - fi do_Show_Info - do_Get_JHBuild - do_Build_JHBuild do_Build_Mozilla - - # Build JHBuild to create a docker image ready to go - jhbuild build m4-common - do_Shrink_Image fi # Clear the environment |