proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-08 09:13:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

contrib/ci: Place all build results in dist/

Browse Source
This commit is contained in:
Mario Limonciello 2018-02-14 01:05:27 -05:00
parent 321f77a07f
commit ef5305ddeb
9 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
.travis.yml
View File

@ -17,4 +17,4 @@ install:
- ./contrib/ci/generate_docker.py - ./contrib/ci/generate_docker.py
script: 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

1
contrib/ci/Dockerfile-arch.in
View File

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

1
contrib/ci/Dockerfile-debian.in
View File

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

1
contrib/ci/Dockerfile-fedora.in
View File

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

1
contrib/ci/Dockerfile-ubuntu.in
View File

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

2
contrib/ci/arch.sh
View File

@ -20,6 +20,6 @@ sudo -E -u nobody makepkg -e --noconfirm
pacman -U --noconfirm *.pkg.tar.xz pacman -U --noconfirm *.pkg.tar.xz
# move the package to working dir # 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 # no testing here because gnome-desktop-testing isn’t available in Arch

9
contrib/ci/debian.sh
View File

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

2
contrib/ci/fedora.sh
View File

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