Fixed CI scripts.
This commit is contained in:
parent
9b2d1700a8
commit
7e35bf47f5
3 changed files with 6 additions and 8 deletions
|
@ -10,7 +10,7 @@ env:
|
||||||
global:
|
global:
|
||||||
- QTVER=5.14.1
|
- QTVER=5.14.1
|
||||||
- QTIFWVER=3.2.2
|
- QTIFWVER=3.2.2
|
||||||
- ARCH_ROOT_DATE=2020.04.01
|
- ARCH_ROOT_DATE=2020.06.01
|
||||||
- ARCH_ROOT_URL=https://mirror.rackspace.com/archlinux
|
- ARCH_ROOT_URL=https://mirror.rackspace.com/archlinux
|
||||||
# BT_KEY
|
# BT_KEY
|
||||||
- secure: "RiR23dM8ft06+5ezNAlfpJXNRQhFH2Cy3hTY9oWD6nyw0qsydgOA9qlogBP0o1/kikyqt2uxv/VRcqZnBV3nkwEg9AuiCRgOuKqMtFdxwNnF8wqxUUz4pun9FQGLNnKkIznJkV61vsuRs8GSO95X3KEwgsoGPD60WQDDuFj3wXcI1kIN7HEP1t3Kq8lbhsYhbMPPeZBUGYcEjuWMz/GcfdcEUQLD6F0bkfEQgLZ+/d5Nqxk3NTJGM/LUYLKuWOthqsK7qNp/BCTRnOCg44NV3XO0DXti4lNkbtbfbLZIEMfD5EeTnbznBd+AHH2OTnw2Gn5ViVz7Z2C9mZgcN+/XyEJi7K80ab9DR9s+ZLMFO2yyF6MVf7/qiOzL0RT7lGFHt2HPLBpTji3qmgPN4JXaXKfF3nIzOjaoUibhTzwh5NlMpkAFlydmYwhBS3argsKQgeck3YTWUUnQVFvkmhFHVZzFBGtqy+0dPr9WGyay0mKKYpnLHqGk74K23dGnBKzk+iJs9o9zVQaSdvS5XnSeRsQCAYlqEKy/sSdrZnLYAOaLv1f291CIm76+e5B2sIkZaGcox7d3rcYw/tqn7ozgsKcyT1BJq8/ZyYSXsIT826ZeDiZd4MFjSQTeas5c9V85btDq2W9LvA66KqzTq0dH5pfJ67+BJJ7ebxUf4HNw6ME="
|
- secure: "RiR23dM8ft06+5ezNAlfpJXNRQhFH2Cy3hTY9oWD6nyw0qsydgOA9qlogBP0o1/kikyqt2uxv/VRcqZnBV3nkwEg9AuiCRgOuKqMtFdxwNnF8wqxUUz4pun9FQGLNnKkIznJkV61vsuRs8GSO95X3KEwgsoGPD60WQDDuFj3wXcI1kIN7HEP1t3Kq8lbhsYhbMPPeZBUGYcEjuWMz/GcfdcEUQLD6F0bkfEQgLZ+/d5Nqxk3NTJGM/LUYLKuWOthqsK7qNp/BCTRnOCg44NV3XO0DXti4lNkbtbfbLZIEMfD5EeTnbznBd+AHH2OTnw2Gn5ViVz7Z2C9mZgcN+/XyEJi7K80ab9DR9s+ZLMFO2yyF6MVf7/qiOzL0RT7lGFHt2HPLBpTji3qmgPN4JXaXKfF3nIzOjaoUibhTzwh5NlMpkAFlydmYwhBS3argsKQgeck3YTWUUnQVFvkmhFHVZzFBGtqy+0dPr9WGyay0mKKYpnLHqGk74K23dGnBKzk+iJs9o9zVQaSdvS5XnSeRsQCAYlqEKy/sSdrZnLYAOaLv1f291CIm76+e5B2sIkZaGcox7d3rcYw/tqn7ozgsKcyT1BJq8/ZyYSXsIT826ZeDiZd4MFjSQTeas5c9V85btDq2W9LvA66KqzTq0dH5pfJ67+BJJ7ebxUf4HNw6ME="
|
||||||
|
|
|
@ -32,6 +32,8 @@ if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
||||||
EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64'
|
EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
BUILDSCRIPT=dockerbuild.sh
|
||||||
|
|
||||||
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
||||||
sudo mount --bind root.x86_64 root.x86_64
|
sudo mount --bind root.x86_64 root.x86_64
|
||||||
sudo mount --bind $HOME root.x86_64/$HOME
|
sudo mount --bind $HOME root.x86_64/$HOME
|
||||||
|
|
|
@ -26,15 +26,11 @@ else
|
||||||
export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -"
|
export DOWNLOAD_CMD="curl --retry 10 -sS -kLOC -"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${TRAVIS_OS_NAME}" = linux ] && [ "${ANDROID_BUILD}" != 1 ]; then
|
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
||||||
if [ "${ARCH_ROOT_BUILD}" = 1 ]; then
|
|
||||||
EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64'
|
EXEC='sudo ./root.x86_64/bin/arch-chroot root.x86_64'
|
||||||
else
|
|
||||||
EXEC="docker exec ${DOCKERSYS}"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${ARCH_ROOT_BUILD}" = 1 ]; then
|
if [ "${TRAVIS_OS_NAME}" = linux ]; then
|
||||||
# Download chroot image
|
# Download chroot image
|
||||||
archImage=archlinux-bootstrap-${ARCH_ROOT_DATE}-x86_64.tar.gz
|
archImage=archlinux-bootstrap-${ARCH_ROOT_DATE}-x86_64.tar.gz
|
||||||
${DOWNLOAD_CMD} ${ARCH_ROOT_URL}/iso/${ARCH_ROOT_DATE}/$archImage
|
${DOWNLOAD_CMD} ${ARCH_ROOT_URL}/iso/${ARCH_ROOT_DATE}/$archImage
|
||||||
|
|
Loading…
Reference in a new issue