From e0d7073821bc8126a898dd8aef2e15c74be05d34 Mon Sep 17 00:00:00 2001 From: eax0r <55549616+eax0r@users.noreply.github.com> Date: Sun, 22 Sep 2019 19:53:02 +0200 Subject: [PATCH 1/2] Travis: Fix Travis CI should build ok now. It was not able to fetch the pyglfw repository. --- .travis.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80a5ad5..1fcd6c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,25 @@ language: c +sudo: required +dist: xenial os: - - linux + - linux compiler: - - gcc - - clang + - gcc + - clang before_install: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo add-apt-repository -y ppa:pyglfw/pyglfw && sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libglew-dev; fi + - if [ $TRAVIS_OS_NAME == linux ]; then + sudo apt-get update -qq; + sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libglew-dev; + wget https://github.com/glfw/glfw/releases/download/3.3/glfw-3.3.zip; + unzip glfw-3.3.zip && cd glfw-3.3; + cmake -DBUILD_SHARED_LIBS=true -DGLFW_BUILD_EXAMPLES=false -DGLFW_BUILD_TESTS=false -DGLFW_BUILD_DOCS=false .; + sudo make -j $CPU_NUM install && cd ..; + fi script: - - make -C demo/glfw_opengl3 CFLAGS="-Wall -DINCLUDE_ALL" - - make -C demo/glfw_opengl2 - - make -C example + - make -C demo/glfw_opengl2 + - make -C demo/glfw_opengl3 + - make -C example From 250dd4eb97745de20c9b7d132bd8c1ef84940243 Mon Sep 17 00:00:00 2001 From: eax0r <55549616+eax0r@users.noreply.github.com> Date: Sun, 22 Sep 2019 23:42:29 +0200 Subject: [PATCH 2/2] No need to build GLFW --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1fcd6c9..f921175 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,6 @@ before_install: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libglew-dev; - wget https://github.com/glfw/glfw/releases/download/3.3/glfw-3.3.zip; - unzip glfw-3.3.zip && cd glfw-3.3; - cmake -DBUILD_SHARED_LIBS=true -DGLFW_BUILD_EXAMPLES=false -DGLFW_BUILD_TESTS=false -DGLFW_BUILD_DOCS=false .; - sudo make -j $CPU_NUM install && cd ..; fi script: