From ce440d8b87e3bd11949a40582f8d6082ec76bc61 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 6 May 2018 00:02:55 +0200 Subject: [PATCH] Update travis config to test rpi setup --- .travis.yml | 203 +++++++--------------------------- scripts/ci/linux64/install.sh | 11 ++ scripts/ci/osx/install.sh | 11 ++ scripts/ci/rpi/install.sh | 3 + scripts/ci/rpi/mkimage.sh | 3 + 5 files changed, 67 insertions(+), 164 deletions(-) create mode 100644 scripts/ci/linux64/install.sh create mode 100644 scripts/ci/osx/install.sh create mode 100644 scripts/ci/rpi/install.sh create mode 100644 scripts/ci/rpi/mkimage.sh diff --git a/.travis.yml b/.travis.yml index fc75078..f9246e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,24 @@ matrix: # fully specify builds, include can't dynamically expand matrix entries # relative order of sudo and env is important so that addons: is recognized + - os: linux + dist: trusty + sudo: required + env: TARGET="rpi" + addons: + apt: + packages: + - qemu + - qemu-user-static + - binfmt-support + - parted + - wget + - dosfstools + - zip + script: + - sudo bash scripts/ci/ + - zip opm.img.zip opm.img + # Linux 64bit, OF master - os: linux dist: trusty @@ -33,55 +51,12 @@ matrix: - g++-4.9 - gdb -# Linux 64bit, OF stable: Not supported yet -# - os: linux -# dist: trusty -# sudo: required -# env: TARGET="linux64" OF_BRANCH="stable" -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - gcc-4.9 -# - g++-4.9 -# - gdb - # OSX, OF master - os: osx osx_image: xcode8 compiler: clang env: TARGET="osx" OF_BRANCH="master" -# OSX, OF stable: Not supported yet -# - os: osx -# osx_image: xcode8 -# compiler: clang -# env: TARGET="osx" OF_BRANCH="stable" - -# Linux ARM6, OF master: Uncomment following lines to enable -# - os: linux -# sudo: required -# dist: trusty -# env: TARGET="linuxarmv6l" OF_BRANCH="master" - - -# Linux ARM6, OF stable: Not supported yet -# - os: linux -# sudo: required -# dist: trusty -# env: TARGET="linuxarmv6l" OF_BRANCH="stable" - -# Linux ARM7, OF master: Uncomment following lines to enable -# - os: linux -# sudo: false -# env: TARGET="linuxarmv7l" OF_BRANCH="master" -# cache: -# directories: -# - ~/rpi2_toolchain -# - ~/firmware-master -# - ~/archlinux - # Linux ARM7, OF stable: Not supported yet # - os: linux # sudo: false @@ -92,135 +67,35 @@ matrix: # - ~/firmware-master # - ~/archlinux - -# Emscripten, OF master: Uncomment following lines to enable -# - os: linux -# sudo: false -# env: TARGET="emscripten" OF_BRANCH="master" -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - libstdc++6 - - -# Emscripten, OF stable: Not supported yet -# - os: linux -# sudo: false -# env: TARGET="emscripten" OF_BRANCH="stable" -# addons: -# apt: -# sources: -# - ubuntu-toolchain-r-test -# packages: -# - libstdc++6 - - -# iOS, OF master: Not supported yet -# - os: osx -# osx_image: xcode8 -# compiler: clang -# env: TARGET="ios" OF_BRANCH="master" - - -# iOS, OF stable: Not supported yet -# - os: osx -# osx_image: xcode8 -# compiler: clang -# env: TARGET="ios" OF_BRANCH="stable" - - -# tvOS, OF master: Not supported yet -# - os: osx -# osx_image: xcode8 -# compiler: clang -# env: TARGET="tvos" OF_BRANCH="master" - - -# tvOS, OF stable: Not supported yet -# - os: osx -# osx_image: xcode8 -# compiler: clang -# env: TARGET="tvos" OF_BRANCH="stable" - - -# Android armv7, OF master: Uncomment following lines to enable -# - os: linux -# sudo: false -# env: TARGET="android" OPT="armv7" OF_BRANCH="master" -# cache: -# directories: -# - ~/android-ndk-r12b - - -# Android armv7, OF stable: Not supported yet -# - os: linux -# sudo: false -# env: TARGET="android" OPT="armv7" OF_BRANCH="stable" -# cache: -# directories: -# - ~/android-ndk-r12b - - -# Android x86, OF master: Uncomment following lines to enable -# - os: linux -# sudo: false -# env: TARGET="android" OPT="x86" OF_BRANCH="master" -# cache: -# directories: -# - ~/android-ndk-r12b - - -# Android x86, OF stable: Not supported yet -# - os: linux -# sudo: false -# env: TARGET="android" OPT="x86" OF_BRANCH="stable" -# cache: -# directories: -# - ~/android-ndk-r12b - - # Exclude the default build that would otherwise be generated # see https://github.com/travis-ci/travis-ci/issues/1228 exclude: - compiler: gcc -# Figure out how to get SDL2 working with example_gamepad -# We will delete if for now before testing -#before_install: -# - if [ "$TARGET" == "linux64" ]; then -# sudo apt-get -qq update; -# sudo apt-get install -y libegl1-mesa-dev; -# sudo apt-get install -y libgles2-mesa-dev; -# sudo apt-get install -y libsdl2-dev; -# fi - install: - - cd ~ - - git clone --depth=1 --branch=$OF_BRANCH https://github.com/openframeworks/openFrameworks - - cd ~/openFrameworks/addons - - git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git - - cd ~/openFrameworks - - scripts/ci/addons/install.sh - - cd ~/openFrameworks/addons/ofxPiMapper - - mv example_basic/addons.make.norpi example_basic/addons.make - - mv example_camera/addons.make.norpi example_camera/addons.make - - mv example_fbo-sources/addons.make.norpi example_fbo-sources/addons.make - - mv example_pocketvj/addons.make.norpi example_pocketvj/addons.make - - mv example_remote-client/addons.make.norpi example_remote-client/addons.make - - mv example_remote-server/addons.make.norpi example_remote-server/addons.make - - mv example_simpler/addons.make.norpi example_simpler/addons.make -# Fix SDL2 and example_gamepad first -# - mv example_gamepad/addons.make.norpi example_gamepad/addons.make -# - if [ "$TARGET" == "osx" ]; then -# brew install sdl2; -# fi - - rm -rf example_gamepad + - | + if [ "${TARGET}" == "rpi" ]; then + pwd + echo "Launch rpi specific install script here." + sudo bash ./scripts/ci/rpi/install.sh + else + cd ~ + git clone --depth=1 --branch=$OF_BRANCH https://github.com/openframeworks/openFrameworks + cd ~/openFrameworks/addons + git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git + cd ~/openFrameworks + scripts/ci/addons/install.sh + fi script: - - cd ~/openFrameworks - - scripts/ci/addons/build.sh + - | + if [ "${TARGET}" == "rpi" ]; then + pwd + sudo bash ./scripts/ci/rpi/mkimage.sh + else + cd ~/openFrameworks + scripts/ci/addons/build.sh + fi git: depth: 10 \ No newline at end of file diff --git a/scripts/ci/linux64/install.sh b/scripts/ci/linux64/install.sh new file mode 100644 index 0000000..a1b2219 --- /dev/null +++ b/scripts/ci/linux64/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +cd ~/openFrameworks/addons/ofxPiMapper +mv example_basic/addons.make.norpi example_basic/addons.make +mv example_camera/addons.make.norpi example_camera/addons.make +mv example_fbo-sources/addons.make.norpi example_fbo-sources/addons.make +mv example_pocketvj/addons.make.norpi example_pocketvj/addons.make +mv example_remote-client/addons.make.norpi example_remote-client/addons.make +mv example_remote-server/addons.make.norpi example_remote-server/addons.make +mv example_simpler/addons.make.norpi example_simpler/addons.make +rm -rf example_gamepad diff --git a/scripts/ci/osx/install.sh b/scripts/ci/osx/install.sh new file mode 100644 index 0000000..a1b2219 --- /dev/null +++ b/scripts/ci/osx/install.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +cd ~/openFrameworks/addons/ofxPiMapper +mv example_basic/addons.make.norpi example_basic/addons.make +mv example_camera/addons.make.norpi example_camera/addons.make +mv example_fbo-sources/addons.make.norpi example_fbo-sources/addons.make +mv example_pocketvj/addons.make.norpi example_pocketvj/addons.make +mv example_remote-client/addons.make.norpi example_remote-client/addons.make +mv example_remote-server/addons.make.norpi example_remote-server/addons.make +mv example_simpler/addons.make.norpi example_simpler/addons.make +rm -rf example_gamepad diff --git a/scripts/ci/rpi/install.sh b/scripts/ci/rpi/install.sh new file mode 100644 index 0000000..477765a --- /dev/null +++ b/scripts/ci/rpi/install.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "Hello! This is rpi install.sh script." diff --git a/scripts/ci/rpi/mkimage.sh b/scripts/ci/rpi/mkimage.sh new file mode 100644 index 0000000..c5b97e5 --- /dev/null +++ b/scripts/ci/rpi/mkimage.sh @@ -0,0 +1,3 @@ +#/bin/bash + +echo "Hello! The rpi mkimage.sh script."