Commit cf091877 authored by akiraohgaki's avatar akiraohgaki
Browse files

Merge branch 'develop'

parents 6eb369d9 3805613b
Pipeline #45 failed with stage
in 13 minutes and 45 seconds
......@@ -8,7 +8,7 @@ ubuntu_deb:
- master
- /^release\-.+/
script:
- ./scripts/package ci_ubuntu_deb
- ./scripts/package ubuntu_deb
- cat transfer.log
fedora_rpm:
......@@ -18,7 +18,7 @@ fedora_rpm:
- master
- /^release\-.+/
script:
- ./scripts/package ci_fedora_rpm
- ./scripts/package fedora_rpm
- cat transfer.log
opensuse_rpm:
......@@ -28,7 +28,7 @@ opensuse_rpm:
- master
- /^release\-.+/
script:
- ./scripts/package ci_opensuse_rpm
- ./scripts/package opensuse_rpm
- cat transfer.log
archlinux_pkg:
......@@ -38,5 +38,5 @@ archlinux_pkg:
- master
- /^release\-.+/
script:
- ./scripts/package ci_archlinux_pkg
- ./scripts/package archlinux_pkg
- cat transfer.log
dist: trusty
sudo: required
services:
- docker
branches:
only:
- master
- /^release\-.+/
script:
- mntdir='/mnt/ocs-url'
- docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_ubuntu_deb"
- docker run --rm -v $(pwd):${mntdir} fedora:20 /bin/bash -c "${mntdir}/scripts/package ci_fedora_rpm"
- docker run --rm -v $(pwd):${mntdir} opensuse:42.1 /bin/bash -c "${mntdir}/scripts/package ci_opensuse_rpm"
- docker run --rm -v $(pwd):${mntdir} base/archlinux:latest /bin/bash -c "${mntdir}/scripts/package ci_archlinux_pkg"
- cat transfer.log
#!/bin/bash
#!/bin/sh
PKGNAME='ocs-url'
......@@ -10,7 +10,7 @@ PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
BUILDDIR="${PROJDIR}/build_${PKGNAME}"
ci_ubuntu_deb() { # docker-image: ubuntu:14.04
ubuntu_deb() { # docker-image: ubuntu:14.04
apt update -qq
apt -y install curl git
apt -y install build-essential qt5-default libqt5svg5-dev qtdeclarative5-dev
......@@ -34,7 +34,7 @@ build_ubuntu_deb() {
debuild -uc -us -b
}
ci_fedora_rpm() { # docker-image: fedora:20
fedora_rpm() { # docker-image: fedora:20
yum -y install curl git
yum -y install make automake gcc gcc-c++ libtool qt5-qtbase-devel qt5-qtsvg-devel qt5-qtdeclarative-devel
yum -y install rpm-build
......@@ -57,7 +57,7 @@ build_fedora_rpm() {
rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
}
ci_opensuse_rpm() { # docker-image: opensuse:42.1
opensuse_rpm() { # docker-image: opensuse:42.1
zypper --non-interactive refresh
zypper --non-interactive install curl git
zypper --non-interactive install make automake gcc gcc-c++ libtool libqt5-qtbase-devel libqt5-qtsvg-devel libqt5-qtdeclarative-devel
......@@ -81,7 +81,7 @@ build_opensuse_rpm() {
rpmbuild --define "_topdir ${BUILDDIR}" -bb "${BUILDDIR}/SPECS/${PKGNAME}.spec"
}
ci_archlinux_pkg() { # docker-image: base/archlinux:latest
archlinux_pkg() { # docker-image: base/archlinux:latest
pacman -Syu --noconfirm
pacman -S --noconfirm curl git
pacman -S --noconfirm base-devel qt5-base qt5-svg qt5-declarative qt5-quickcontrols
......@@ -106,13 +106,13 @@ build_archlinux_pkg() {
}
export_srcarchive() {
if [[ "${1}" ]]; then
if [ "${1}" ]; then
$(cd "${PROJDIR}" && git archive --prefix="${PKGNAME}/" --output="${1}" HEAD)
fi
}
transfer_file() {
if [[ -f "${1}" ]]; then
if [ -f "${1}" ]; then
filename="$(basename "${1}")"
transferlog="${PROJDIR}/transfer.log"
echo "Uploading ${filename}" >> "${transferlog}"
......@@ -121,6 +121,6 @@ transfer_file() {
fi
}
if [[ "${1}" = 'ci_'* || "${1}" = 'build_'* ]]; then
if [ "${1}" ]; then
${1}
fi
#!/bin/bash
#!/bin/sh
PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
if [[ ! -d "${PROJDIR}/lib/qtil" ]]; then
if [ ! -d "${PROJDIR}/lib/qtil" ]; then
git clone https://github.com/akiraohgaki/qtil.git -b release-0.4.0 --single-branch --depth=1 "${PROJDIR}/lib/qtil"
fi
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment