mirror of
https://github.com/Yubico/yubioath-flutter.git
synced 2024-11-23 09:56:23 +03:00
Build yubikey-manager as part of docker build.
This commit is contained in:
parent
f37df42c43
commit
2a64f41d95
@ -21,7 +21,10 @@ before_install:
|
|||||||
- |
|
- |
|
||||||
if [[ "$TRAVIS_OS_NAME" == "linux" ]]
|
if [[ "$TRAVIS_OS_NAME" == "linux" ]]
|
||||||
then
|
then
|
||||||
docker build -t xenial -f docker/xenial/Dockerfile .
|
cd vendor/yubikey-manager && docker build -t ykman-xenial -f docker/xenial/Dockerfile .
|
||||||
|
id=$(docker create ykman-xenial)
|
||||||
|
docker cp $id:/yubikey-manager-debian-packages.tar.gz ykman-deb.tar.gz
|
||||||
|
docker build -t yubioath-xenial -f docker/xenial/Dockerfile .
|
||||||
fi
|
fi
|
||||||
- |
|
- |
|
||||||
if [[ "$TRAVIS_OS_NAME" == "osx" ]]
|
if [[ "$TRAVIS_OS_NAME" == "osx" ]]
|
||||||
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
|||||||
yubioath-desktop (4.0.0~ppa1) xenial; urgency=low
|
yubioath-desktop (4.3.0~pre1) xenial; urgency=low
|
||||||
|
|
||||||
* Build for ppa
|
* Build for ppa
|
||||||
|
|
||||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9),
|
|||||||
qml-module-io-thp-pyotherside,
|
qml-module-io-thp-pyotherside,
|
||||||
qml-module-qt-labs-settings,
|
qml-module-qt-labs-settings,
|
||||||
libqt5svg5-dev,
|
libqt5svg5-dev,
|
||||||
yubikey-manager (>= 0.5.0)
|
yubikey-manager (>= 0.5.0~pre1)
|
||||||
Homepage: https://developers.yubico.com/yubioath-desktop/
|
Homepage: https://developers.yubico.com/yubioath-desktop/
|
||||||
|
|
||||||
Package: yubioath-desktop
|
Package: yubioath-desktop
|
||||||
|
@ -26,12 +26,14 @@ RUN apt-get install -qq \
|
|||||||
qml-module-io-thp-pyotherside \
|
qml-module-io-thp-pyotherside \
|
||||||
qml-module-qt-labs-settings \
|
qml-module-qt-labs-settings \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
python3-dev \
|
python3-dev
|
||||||
yubikey-manager
|
|
||||||
RUN pip3 install --upgrade pip
|
RUN pip3 install --upgrade pip
|
||||||
COPY . yubioath-desktop
|
COPY . yubioath-desktop
|
||||||
|
RUN tar xfa yubioath-desktop/ykman-deb.tar.gz
|
||||||
|
RUN dpkg -i /deb/python3-yubikey-manager_*.deb; exit 0
|
||||||
|
RUN dpkg -i /deb/yubikey-manager_*.deb; exit 0
|
||||||
|
RUN apt-get install -f -qq
|
||||||
RUN cd yubioath-desktop && qmake -qt=qt5 && make
|
RUN cd yubioath-desktop && qmake -qt=qt5 && make
|
||||||
RUN cd yubioath-desktop && debuild -us -uc
|
RUN cd yubioath-desktop && debuild -us -uc
|
||||||
RUN mkdir /deb
|
|
||||||
RUN mv /yubioath-desktop_* /deb
|
RUN mv /yubioath-desktop_* /deb
|
||||||
RUN cd / && tar czf yubioath-desktop-debian-packages.tar.gz deb
|
RUN cd / && tar czf yubioath-desktop-debian-packages.tar.gz deb
|
||||||
|
2
vendor/yubikey-manager
vendored
2
vendor/yubikey-manager
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 30170f4770563c15b3f691b9f25e38ef4582602d
|
Subproject commit ab4a6e44eb292e04ea772cdafce734f3343501e2
|
Loading…
Reference in New Issue
Block a user