From 36f45415db5277b9c5a45196407187027f07ce77 Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Fri, 20 Nov 2020 20:44:16 +0200 Subject: [PATCH] Remove old ci scripts --- scripts/ci/linux64/install.sh | 11 ---- scripts/ci/msys2/install.sh | 18 ------- scripts/ci/osx/install.sh | 11 ---- scripts/ci/rpi/build-script.sh | 7 --- scripts/ci/rpi/build.sh | 72 ------------------------- scripts/ci/rpi/install.sh | 3 -- scripts/ci/rpi/prepare-script.sh | 18 ------- scripts/ci/rpi/prepare.sh | 90 -------------------------------- scripts/ci/vs/install.sh | 18 ------- 9 files changed, 248 deletions(-) delete mode 100755 scripts/ci/linux64/install.sh delete mode 100644 scripts/ci/msys2/install.sh delete mode 100755 scripts/ci/osx/install.sh delete mode 100644 scripts/ci/rpi/build-script.sh delete mode 100644 scripts/ci/rpi/build.sh delete mode 100644 scripts/ci/rpi/install.sh delete mode 100644 scripts/ci/rpi/prepare-script.sh delete mode 100644 scripts/ci/rpi/prepare.sh delete mode 100644 scripts/ci/vs/install.sh diff --git a/scripts/ci/linux64/install.sh b/scripts/ci/linux64/install.sh deleted file mode 100755 index a1b2219..0000000 --- a/scripts/ci/linux64/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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/msys2/install.sh b/scripts/ci/msys2/install.sh deleted file mode 100644 index d633b2f..0000000 --- a/scripts/ci/msys2/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -echo ">> Custom ofxPiMapper CI install script for msys2" -pwd -git clone --depth=1 https://github.com/jeffcrouse/ofxJSON addons/ofxJSON - -# Test only part of examples because uf the 60m time limit on AppVeyor -mv addons/ofxPiMapper/example_basic/addons.make.norpi addons/ofxPiMapper/example_basic/addons.make -mv addons/ofxPiMapper/example_fbo-sources/addons.make.norpi addons/ofxPiMapper/example_fbo-sources/addons.make -mv addons/ofxPiMapper/example_remote-client/addons.make.norpi addons/ofxPiMapper/example_remote-client/addons.make -mv addons/ofxPiMapper/example_remote-server/addons.make.norpi addons/ofxPiMapper/example_remote-server/addons.make - -# Delete the rest -rm -rf addons/ofxPiMapper/example_gamepad -rm -rf addons/ofxPiMapper/example_pocketvj -rm -rf addons/ofxPiMapper/example_simpler -rm -rf addons/ofxPiMapper/example_camera -echo ">> Custom install script done" diff --git a/scripts/ci/osx/install.sh b/scripts/ci/osx/install.sh deleted file mode 100755 index a1b2219..0000000 --- a/scripts/ci/osx/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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/build-script.sh b/scripts/ci/rpi/build-script.sh deleted file mode 100644 index 2792738..0000000 --- a/scripts/ci/rpi/build-script.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -echo "Begin build-script.sh" - -sudo timelimit -S9 -t2000 -T10 make -j $(nproc) -C /home/pi/openFrameworks/addons/ofxPiMapper/example_basic - -echo "End build-script.sh" diff --git a/scripts/ci/rpi/build.sh b/scripts/ci/rpi/build.sh deleted file mode 100644 index c11925b..0000000 --- a/scripts/ci/rpi/build.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -# Setup script error handling see https://disconnected.systems/blog/another-bash-strict-mode for details -set -xuo pipefail -trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR -IFS=$'\n\t' - -# Ensure we are root -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" 1>&2 - exit 1 -fi - -# Image creation constants. -# See .travis.yml for environment variables. -MOUNT="mnt" -SCRIPT="build-script.sh" - -# Unmount drives and general cleanup on exit, the trap ensures this will always -# run execpt in the most extream cases. -cleanup() { - [[ -f "${MOUNT}/tmp/${SCRIPT}" ]] && rm "${MOUNT}/tmp/${SCRIPT}" - if [[ -d "${MOUNT}" ]]; then - umount "${MOUNT}/dev/pts" || true - umount "${MOUNT}/dev" || true - umount "${MOUNT}/proc" || true - umount "${MOUNT}/sys" || true - umount "${MOUNT}/boot" || true - umount "${MOUNT}" || true - rmdir "${MOUNT}" || true - fi - [ -n "${loopdev:-}" ] && losetup --detach "${loopdev}" || true -} -trap cleanup EXIT - -# Unzip Raspbian -# -u update files, create if necessary -unzip -u "${IMAGE}.zip" - -# Configure loopback device. -loopdev=$(losetup --find --show "${IMAGE}") -echo "Created loopback device ${loopdev}" - -echo "Mounting filesystem." -bootdev="${loopdev}p1" -rootdev="${loopdev}p2" -partprobe "${loopdev}" - -[ ! -d "${MOUNT}" ] && mkdir "${MOUNT}" -mount "${rootdev}" "${MOUNT}" -[ ! -d "${MOUNT}/boot" ] && mkdir "${MOUNT}/boot" -mount "${bootdev}" "${MOUNT}/boot" - -# Copy our installation script and other artifacts. -install -Dm755 "./scripts/ci/rpi/${SCRIPT}" "${MOUNT}/tmp/${SCRIPT}" - -# Prep the chroot. -mount --bind /proc "${MOUNT}/proc" -mount --bind /sys "${MOUNT}/sys" -mount --bind /dev "${MOUNT}/dev" -mount --bind /dev/pts "${MOUNT}/dev/pts" - -cp /etc/resolv.conf "${MOUNT}/etc/resolv.conf" -cp /usr/bin/qemu-arm-static "${MOUNT}/usr/bin" -cp "${MOUNT}/etc/ld.so.preload" "${MOUNT}/etc/_ld.so.preload" -echo "" > "${MOUNT}/etc/ld.so.preload" - -# Run the installation script as if we would be inside the Raspberry Pi. -chroot "${MOUNT}" "/tmp/${SCRIPT}" - -# Put back the old ld.so.preload script. -mv "${MOUNT}/etc/_ld.so.preload" "${MOUNT}/etc/ld.so.preload" diff --git a/scripts/ci/rpi/install.sh b/scripts/ci/rpi/install.sh deleted file mode 100644 index 477765a..0000000 --- a/scripts/ci/rpi/install.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "Hello! This is rpi install.sh script." diff --git a/scripts/ci/rpi/prepare-script.sh b/scripts/ci/rpi/prepare-script.sh deleted file mode 100644 index cece28e..0000000 --- a/scripts/ci/rpi/prepare-script.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -echo "Begin prepare-script.sh" - -echo "Installing extra packages." -sudo apt-get -yq install usbmount dosfstools exfat-fuse exfat-utils timelimit - -echo "Setting hostname." -echo "opm" > /etc/hostname -cat /etc/hostname - -echo "Setting up to run on boot." -crontab -l > mycron -echo "@reboot /home/pi/openFrameworks/addons/ofxPiMapper/example_basic/bin/example_basic" >> mycron -crontab mycron -rm mycron - -echo "End prepare-script.sh" diff --git a/scripts/ci/rpi/prepare.sh b/scripts/ci/rpi/prepare.sh deleted file mode 100644 index 14905e0..0000000 --- a/scripts/ci/rpi/prepare.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# Setup script error handling see https://disconnected.systems/blog/another-bash-strict-mode for details -set -xuo pipefail -trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR -IFS=$'\n\t' - -# Ensure we are root -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root" 1>&2 - exit 1 -fi - -# Image creation constants. -# See .travis.yml for environment variables. -MOUNT="mnt" -SCRIPT="prepare-script.sh" - -# Unmount drives and general cleanup on exit, the trap ensures this will always -# run execpt in the most extream cases. -cleanup() { - [[ -f "${MOUNT}/tmp/${SCRIPT}" ]] && rm "${MOUNT}/tmp/${SCRIPT}" - if [[ -d "${MOUNT}" ]]; then - umount "${MOUNT}/dev/pts" || true - umount "${MOUNT}/dev" || true - umount "${MOUNT}/proc" || true - umount "${MOUNT}/sys" || true - umount "${MOUNT}/boot" || true - umount "${MOUNT}" || true - rmdir "${MOUNT}" || true - fi - [ -n "${loopdev:-}" ] && losetup --detach "${loopdev}" || true -} -trap cleanup EXIT - -# Download raspbian arm only if we have not already done so -[ ! -f "${RPI_ZIP}" ] && wget --progress=bar:force "${RPI_URL}" - -# Unzip Raspbian -# -u update files, create if necessary -unzip -u "${RPI_ZIP}" - -mv "$(ls *.img | head -n 1)" "${IMAGE}" - -# Configure loopback device. -loopdev=$(losetup --find --show "${IMAGE}") -echo "Created loopback device ${loopdev}" - -echo "Mounting filesystem." -bootdev="${loopdev}p1" -rootdev="${loopdev}p2" -partprobe "${loopdev}" - -[ ! -d "${MOUNT}" ] && mkdir "${MOUNT}" -mount "${rootdev}" "${MOUNT}" -[ ! -d "${MOUNT}/boot" ] && mkdir "${MOUNT}/boot" -mount "${bootdev}" "${MOUNT}/boot" - -# Copy our installation script and other artifacts. -install -Dm755 "./scripts/ci/rpi/${SCRIPT}" "${MOUNT}/tmp/${SCRIPT}" - -# Prep the chroot. -mount --bind /proc "${MOUNT}/proc" -mount --bind /sys "${MOUNT}/sys" -mount --bind /dev "${MOUNT}/dev" -mount --bind /dev/pts "${MOUNT}/dev/pts" - -cp /etc/resolv.conf "${MOUNT}/etc/resolv.conf" -cp /usr/bin/qemu-arm-static "${MOUNT}/usr/bin" -cp "${MOUNT}/etc/ld.so.preload" "${MOUNT}/etc/_ld.so.preload" -echo "" > "${MOUNT}/etc/ld.so.preload" - -# git clone addons -git clone --depth=1 https://github.com/jeffcrouse/ofxJSON.git "${MOUNT}/home/pi/openFrameworks/addons/ofxJSON" -git clone https://github.com/jvcleave/ofxOMXPlayer.git "${MOUNT}/home/pi/openFrameworks/addons/ofxOMXPlayer" -CURRENT=$(pwd) -cd "${MOUNT}/home/pi/openFrameworks/addons/ofxOMXPlayer" -git checkout 0.9.0-compatible -cd "${CURRENT}" - -# copy ofxPiMapper to openFrameworks/addons -mkdir "${MOUNT}/home/pi/openFrameworks/addons/ofxPiMapper" -cp -r ./src "${MOUNT}/home/pi/openFrameworks/addons/ofxPiMapper/" -cp -r ./example* "${MOUNT}/home/pi/openFrameworks/addons/ofxPiMapper/" - -# Run the installation script as if we would be inside the Raspberry Pi. -chroot "${MOUNT}" "/tmp/${SCRIPT}" - -# Put back the old ld.so.preload script. -mv "${MOUNT}/etc/_ld.so.preload" "${MOUNT}/etc/ld.so.preload" diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh deleted file mode 100644 index 3ee56f7..0000000 --- a/scripts/ci/vs/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -echo ">> Custom ofxPiMapper CI install script for VS" -pwd -git clone --depth=1 https://github.com/jeffcrouse/ofxJSON addons/ofxJSON - -# Test only part of examples because uf the 60m time limit on AppVeyor -mv addons/ofxPiMapper/example_basic/addons.make.norpi addons/ofxPiMapper/example_basic/addons.make -mv addons/ofxPiMapper/example_fbo-sources/addons.make.norpi addons/ofxPiMapper/example_fbo-sources/addons.make -mv addons/ofxPiMapper/example_remote-client/addons.make.norpi addons/ofxPiMapper/example_remote-client/addons.make -mv addons/ofxPiMapper/example_remote-server/addons.make.norpi addons/ofxPiMapper/example_remote-server/addons.make - -# Delete the rest -rm -rf addons/ofxPiMapper/example_gamepad -rm -rf addons/ofxPiMapper/example_pocketvj -rm -rf addons/ofxPiMapper/example_simpler -rm -rf addons/ofxPiMapper/example_camera -echo ">> Custom install script done"