Skip to content
Snippets Groups Projects
Unverified Commit 3805f3c9 authored by akiraohgaki's avatar akiraohgaki Committed by GitHub
Browse files

Merge pull request #38 from opendesktop/develop

Develop
parents 01489261 5bf34d7b
No related branches found
No related tags found
No related merge requests found
...@@ -18,13 +18,13 @@ ci_appimage() { # docker-image: ubuntu:14.04 ...@@ -18,13 +18,13 @@ ci_appimage() { # docker-image: ubuntu:14.04
apt -y install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar apt -y install libfontconfig1 libfreetype6 libssl1.0.0 zlib1g unzip p7zip unar
apt -y install software-properties-common apt -y install software-properties-common
add-apt-repository -y ppa:beineri/opt-qt594-trusty add-apt-repository -y ppa:beineri/opt-qt595-trusty
echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list echo 'deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /' > /etc/apt/sources.list.d/curl-httponly.list
curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_14.04/Release.key | apt-key add - curl -fsSL https://download.opensuse.org/repositories/home:TheAssassin:AppImageLibraries/xUbuntu_14.04/Release.key | apt-key add -
apt update -qq apt update -qq
apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets apt -y install build-essential mesa-common-dev libglu1-mesa-dev qt59base qt59websockets
curl -fsSL https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C / curl -fsSL https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz | tar -xz --strip-components=1 -C /
apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev apt -y install libssl-dev libcurl3 libcurl3-gnutls libcurl4-gnutls-dev libxpm-dev
useradd -m ${PKGUSER} useradd -m ${PKGUSER}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment