contrib/ci: Place all build results in dist/

.gitignore

@@ -1 +1,2 @@
 /build
+/dist

.travis.yml

@@ -17,4 +17,4 @@ install:
   - ./contrib/ci/generate_docker.py
 
 script:
-  - docker run -e OS=$OS -e CI=true -t -v `pwd`:/build fwupd-$OS
+  - docker run -e OS=$OS -e CI=true -t -v `pwd`/dist:/build/dist fwupd-$OS

contrib/ci/Dockerfile-arch.in

@@ -8,4 +8,5 @@ RUN pacman -Syu --noconfirm archlinux-keyring
 %%%INSTALL_DEPENDENCIES_COMMAND%%%
 RUN mkdir /build
 WORKDIR /build
+COPY . .
 CMD ["./contrib/ci/arch.sh"]

contrib/ci/Dockerfile-debian.in

@@ -4,4 +4,5 @@ RUN echo fubar > /etc/machine-id
 %%%INSTALL_DEPENDENCIES_COMMAND%%%
 RUN mkdir /build
 WORKDIR /build
+COPY . .
 CMD ["./contrib/ci/debian.sh"]

contrib/ci/Dockerfile-fedora.in

@@ -8,4 +8,5 @@ RUN echo fubar > /etc/machine-id
 %%%INSTALL_DEPENDENCIES_COMMAND%%%
 RUN mkdir /build
 WORKDIR /build
+COPY . .
 CMD ["./contrib/ci/fedora.sh"]

contrib/ci/Dockerfile-ubuntu.in

@@ -4,4 +4,5 @@ RUN echo fubar > /etc/machine-id
 %%%INSTALL_DEPENDENCIES_COMMAND%%%
 RUN mkdir /build
 WORKDIR /build
+COPY . .
 CMD ["./contrib/ci/ubuntu.sh"]

contrib/ci/arch.sh

@@ -20,6 +20,6 @@ sudo -E -u nobody makepkg -e --noconfirm
 pacman -U --noconfirm *.pkg.tar.xz
 
 # move the package to working dir
-mv *.pkg.tar.xz ../
+mv *.pkg.tar.xz ../dist
 
 # no testing here because gnome-desktop-testing isn’t available in Arch

contrib/ci/debian.sh

@@ -16,7 +16,7 @@ VERSION=`git describe | sed 's/-/+r/;s/-/+/'`
 rm -rf build/
 mkdir -p build
 shopt -s extglob
-cp -lR !(build) build/
+cp -lR !(build|dist) build/
 pushd build
 mv contrib/debian .
 sed s/quilt/native/ debian/source/format -i
@@ -47,7 +47,8 @@ if [ ! -f /.dockerenv ]; then
 fi
 
 #test the packages install
-dpkg -i `ls ../*.deb | grep -v 'fwupd-tests\|dbgsym'`
+PACKAGES=$(ls ../*.deb | grep -v 'fwupd-tests\|dbgsym')
+dpkg -i $PACKAGES
 
 # run the installed tests
 if [ "$CI" = "true" ]; then
@@ -62,3 +63,7 @@ apt purge -y fwupd \
 	     fwupd-doc \
 	     libfwupd2 \
 	     libfwupd-dev
+
+#place built packages in dist outside docker
+mkdir -p ../dist
+cp $PACKAGES ../dist

contrib/ci/fedora.sh

@@ -47,7 +47,7 @@ fi
 #install RPM packages
 dnf install -y $HOME/rpmbuild/RPMS/*/*.rpm
 
-cp $HOME/rpmbuild/RPMS/*/*.rpm .
+cp $HOME/rpmbuild/RPMS/*/*.rpm dist
 
 # run the installed tests
 if [ "$CI" = "true" ]; then