On Mon, Nov 5, 2018 at 2:01 PM Aleix Pol <aleix...@kde.org> wrote: > > On Sun, Nov 4, 2018 at 2:52 AM Ben Cooksley <bcooks...@kde.org> wrote: > > > > On Sun, 4 Nov 2018, 14:18 Aleix Pol <aleix...@kde.org wrote: > >> > >> I'm confused, this adds rsync and comments rsync out. > > > > > > I had to comment rsync out because we can't rebuild the image at the moment. > > > > I added it to the image for later on, when we can rebuild the image again. > > > > Once we can, then that part of this commit can be reverted. > > > > > >> On Sat, Nov 3, 2018 at 4:48 AM Ben Cooksley <n...@kde.org> wrote: > >> > > >> > Git commit a01c4d1ba8fd31f1112c207b61542b14aab3e9e8 by Ben Cooksley. > >> > Committed on 03/11/2018 at 03:48. > >> > Pushed by bcooksley into branch 'master'. > >> > > >> > Disable parts of the System Dependency building on Android CI until > >> > rsync can be made available. > >> > The Docker image for Android CI currently can't be built due to missing > >> > tags/branches in the Qt Git repositories which were previously present. > >> > See > >> > https://build.kde.org/job/Administration/job/Docker%20Generate%20AndroidQt5.11%20SDK/ > >> > for more information. > >> > > >> > CCMAIL: kde-frameworks-devel@kde.org > >> > CCMAIL: aleix...@kde.org > >> > > >> > M +1 -1 pipeline-templates/AndroidQt5.11.template > >> > M +1 -0 system-images/android/sdk/Dockerfile > >> > > >> > https://commits.kde.org/sysadmin/ci-tooling/a01c4d1ba8fd31f1112c207b61542b14aab3e9e8 > >> > > >> > diff --git a/pipeline-templates/AndroidQt5.11.template > >> > b/pipeline-templates/AndroidQt5.11.template > >> > index 17d21da..1c5f1b1 100644 > >> > --- a/pipeline-templates/AndroidQt5.11.template > >> > +++ b/pipeline-templates/AndroidQt5.11.template > >> > @@ -68,7 +68,7 @@ timestamps { > >> > > >> > \$systemDependencies > >> > > >> > - rsync -Ha > >> > '\$DESTDIR/\$APP_INSTALL_PREFIX/' '\$APP_INSTALL_PREFIX/' > >> > + #rsync -Ha > >> > '\$DESTDIR/\$APP_INSTALL_PREFIX/' '\$APP_INSTALL_PREFIX/' > >> > """ > >> > } > >> > > >> > diff --git a/system-images/android/sdk/Dockerfile > >> > b/system-images/android/sdk/Dockerfile > >> > index 14deab2..14034ea 100644 > >> > --- a/system-images/android/sdk/Dockerfile > >> > +++ b/system-images/android/sdk/Dockerfile > >> > @@ -13,6 +13,7 @@ RUN apt-get -qq update && apt-get install -qq \ > >> > build-essential \ > >> > gperf gettext \ > >> > python3 python3-paramiko python3-lxml python3-yaml \ > >> > + rsync \ > >> > bison flex \ > >> > ruby wget \ > >> > libxml2-utils \ > > Build is fixed now, sorry for the trouble.
No worries - thanks for sorting this out. I've now restored the rsync command execution. > > Aleix Cheers, Ben
