diff --git a/.gitignore b/.gitignore index 796b96d1c..2247d5f95 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /build +/dist diff --git a/.travis.yml b/.travis.yml index eca6fddb9..e8c5a072d 100644 --- a/.travis.yml +++ b/.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 diff --git a/contrib/ci/Dockerfile-arch.in b/contrib/ci/Dockerfile-arch.in index ab3bca448..8d2a2b7ac 100644 --- a/contrib/ci/Dockerfile-arch.in +++ b/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"] diff --git a/contrib/ci/Dockerfile-debian.in b/contrib/ci/Dockerfile-debian.in index 99223ee4a..2666d3330 100644 --- a/contrib/ci/Dockerfile-debian.in +++ b/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"] diff --git a/contrib/ci/Dockerfile-fedora.in b/contrib/ci/Dockerfile-fedora.in index 0a7d3f4d6..8cc38563e 100644 --- a/contrib/ci/Dockerfile-fedora.in +++ b/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"] diff --git a/contrib/ci/Dockerfile-ubuntu.in b/contrib/ci/Dockerfile-ubuntu.in index c3cf39dd8..14f253c3f 100644 --- a/contrib/ci/Dockerfile-ubuntu.in +++ b/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"] diff --git a/contrib/ci/arch.sh b/contrib/ci/arch.sh index d9492fffe..7dfd01266 100755 --- a/contrib/ci/arch.sh +++ b/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 diff --git a/contrib/ci/debian.sh b/contrib/ci/debian.sh index 415280486..977a06335 100755 --- a/contrib/ci/debian.sh +++ b/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 diff --git a/contrib/ci/fedora.sh b/contrib/ci/fedora.sh index 1f3f08431..240282a11 100755 --- a/contrib/ci/fedora.sh +++ b/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