Commit 0e0f5cb8 authored by akiraohgaki's avatar akiraohgaki

Merge branch 'develop'

parents fb1c252d 0b87d69c
Pipeline #47 failed with stage
in 7 minutes and 7 seconds
......@@ -8,5 +8,5 @@ appimage:
- master
- /^release\-.+/
script:
- ./scripts/package ci_appimage
- ./scripts/package appimage
- cat transfer.log
dist: trusty
sudo: required
services:
- docker
branches:
only:
- master
- /^release\-.+/
script:
- mntdir='/mnt/ocs-store'
- docker run --rm -v $(pwd):${mntdir} ubuntu:14.04 /bin/bash -c "${mntdir}/scripts/package ci_appimage"
- cat transfer.log
#!/bin/bash
#!/bin/sh
PREFIX="$(cd "$(dirname "${0}")" && pwd)"
if [[ -f "${PREFIX}/ocs-store-linux-x64/ocs-store" ]]; then
if [ -f "${PREFIX}/ocs-store-linux-x64/ocs-store" ]; then
${PREFIX}/ocs-store-linux-x64/ocs-store
elif [[ -f "${PREFIX}/../lib/ocs-store-linux-x64/ocs-store" ]]; then
elif [ -f "${PREFIX}/../lib/ocs-store-linux-x64/ocs-store" ]; then
${PREFIX}/../lib/ocs-store-linux-x64/ocs-store
elif [[ -f "${PREFIX}/usr/local/lib/ocs-store-linux-x64/ocs-store" ]]; then
elif [ -f "${PREFIX}/usr/local/lib/ocs-store-linux-x64/ocs-store" ]; then
${PREFIX}/usr/local/lib/ocs-store-linux-x64/ocs-store
elif [[ -f "${PREFIX}/usr/lib/ocs-store-linux-x64/ocs-store" ]]; then
elif [ -f "${PREFIX}/usr/lib/ocs-store-linux-x64/ocs-store" ]; then
${PREFIX}/usr/lib/ocs-store-linux-x64/ocs-store
else
exit 1
......
#!/bin/bash
#!/bin/sh
PKGNAME='ocs-store'
PKGVER='3.3.1'
......
#!/bin/bash
#!/bin/sh
PKGNAME='ocs-store'
......@@ -10,7 +10,7 @@ PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
BUILDDIR="${PROJDIR}/build_${PKGNAME}"
ci_appimage() { # docker-image: ubuntu:14.04
appimage() { # docker-image: ubuntu:14.04
apt update -qq
apt -y install curl git
#apt -y install build-essential qt5-default libqt5websockets5-dev
......@@ -24,7 +24,7 @@ ci_appimage() { # docker-image: ubuntu:14.04
apt update -qq
apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
curl -fsSL https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
curl -fsSL https://cmake.org/files/v3.12/cmake-3.12.1-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
$(git clone https://github.com/tj/n.git -b master --single-branch --depth=1 "${PROJDIR}/n" && cd "${PROJDIR}/n" && make install && rm -rf "${PROJDIR}/n" && n lts)
......@@ -49,13 +49,13 @@ build_appimage() {
}
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}"
......@@ -64,6 +64,6 @@ transfer_file() {
fi
}
if [[ "${1}" = 'ci_'* || "${1}" = 'build_'* ]]; then
if [ "${1}" ]; then
${1}
fi
Markdown is supported
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