diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 21ac995a9..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "travis-lazarus"] - path = tools/travis/lazarus - url = https://github.com/nielsAD/travis-lazarus.git diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2cea38681..000000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ -sudo: true -language: generic - -matrix: - include: - - os: linux - env: LAZ_VER=1.6 LAZ_ENV=wine WINEARCH=win32 LAZ_OPT="--os=win32 --cpu=i386" - dist: trusty - - - os: linux - env: VARIANT=appimage - dist: trusty - arch: amd64 - if: branch =~ appimage - - - os: linux - env: VARIANT=appimage BUILD_32BIT=yes - dist: focal - arch: amd64 - if: branch =~ appimage - - - os: linux - dist: focal - arch: amd64 - - - os: osx - -env: - global: - - WINEPREFIX=~/.winelaz - - DISPLAY=:99.0 - -before_install: - - tools/travis/before_install.sh - -install: - - tools/travis/install.sh - -script: - - tools/travis/build.sh - -cache: - bundler: false - directories: - - dists/linux/prefix diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index c2a8c86fd..d1717729d 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -1,4 +1,3 @@ -[![Build Status](https://travis-ci.org/UltraStar-Deluxe/USDX.svg?branch=master)](https://travis-ci.org/UltraStar-Deluxe/USDX) [![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](LICENSE) # Welcome to UltraStar Deluxe (USDX) development! @@ -11,7 +10,7 @@ The intention of this document is to introduce you to USDX development. - Please use CamelCase naming. Classes/Units/Types/Functions should start with a capital letter and constants/values/instances should start with small letters - You can use Windows or Linux or OS X for development just fine. See readme.md for linux / OS X install instructions. - As soon as whatever you changed works somewhat and doesn't break much of general gameplay, please commit it to the git code repository. If you work on bigger parts, please use a separate branch and commit your changes there often, so that your work in progress is visible. No one will judge you on work-in-progress code quality - we don't get paid for this so screw the other people if they complain ;-) . -- There is travis continuous integration set up. It will email project members if build of the master branch or some other branch is broken. This is quite helpful because linux users and other more tech savy users tend to run the most recent code so that they can use all the neat new features. Please keep them happy by not breaking too much of general singstar-like karaoke gameplay on the master branch. +- There is Github Actions continuous integration set up. It will email project members if build of the master branch or some other branch is broken. This is quite helpful because linux users and other more tech savy users tend to run the most recent code so that they can use all the neat new features. Please keep them happy by not breaking too much of general singstar-like karaoke gameplay on the master branch. - If you start working on something that is more then just a small code change, please create an issue in the git repository issue tracker for that and assign it to yourself, so the other developers don't touch it in the mean time. - Please write somewhat reusable code and split big problems into smaller functions. :) - If you have questions, feel free to ask them in the irc channel or on the issue tracker. diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ba4dd7f92..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,74 +0,0 @@ -environment: - NewPascalVersion: v1.0.50 - -image: - - Visual Studio 2015 - - Ubuntu - -configuration: - - x86-64 - - x86-32 - -cache: - - dists/linux/prefix -> dists/linux/dl.sh, dists/linux/tasks.sh - -matrix: - exclude: - - image: Visual Studio 2015 - configuration: x86-64 - -for: - # Windows - - - matrix: - only: - - image: Visual Studio 2015 - - install: - - appveyor AddMessage -Category Information "Downloading NewPascal %NewPascalVersion%..." - - appveyor DownloadFile https://github.com/newpascal/newpascal/releases/download/np-%NewPascalVersion%/newpascal.zip - - appveyor AddMessage "Unpacking NewPascal %NewPascalVersion%..." - - 7z x -y "newpascal.zip" -o"C:\" > nul - - appveyor AddMessage -Category Information "Configuring NewPascal..." - - c:\newpascal\configure.bat - - set FPCDIR=c:\newpascal\fpcsrc - - set PATH=c:\newpascal\fpc\bin\i386-win32;c:\newpascal\binw32;C:\Program Files (x86)\NSIS;%path% - - build_script: - - appveyor AddMessage -Category Information "Building UltraStar-Deluxe..." - - c:\newpascal\lazarus\lazbuild src\ultrastardx-win.lpi --lazarusdir=c:\newpascal\lazarus - - appveyor AddMessage -Category Information "Done." - - after_build: - - del game\*.debug - - appveyor AddMessage -Category Information "Creating Installer..." - - xcopy game\*.dll installer\dependencies\dll /y - - makensis "installer\UltraStar Deluxe.nsi" - - appveyor AddMessage -Category Information "Done." - - artifacts: - - path: game - name: UltraStar.Deluxe_continuous_portable - type: zip - - path: installer\dist\UltraStar.Deluxe_*_installer.exe - - # Centos 7 (AppImage) - - - matrix: - only: - - image: Ubuntu - - platform: - - x64 - - build_script: - - sh: cd dists/linux - - sh: sed -i '/docker/s/-it\>//' dockerenv.sh - - sh: prepend="" - - sh: case "$CONFIGURATION" in x86-32) prepend=linux32 ;; esac - - sh: $prepend ./dockerenv.sh make compress - - sh: for i in *.AppImage ; do mv $i ../../UltraStarDeluxe-$(git describe --tags --always --long).${i#*-} ; done - - artifacts: - - path: UltraStarDeluxe-*.AppImage - name: UltraStarDeluxe AppImage diff --git a/tools/travis/before_install.sh b/tools/travis/before_install.sh deleted file mode 100755 index f670a7c83..000000000 --- a/tools/travis/before_install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -if [ -n "$LAZ_VER" ]; then - # Lazarus build (with wine) - - # Start virtual display server - this should be done in the .travis.yml services area once the Lazarus submodule supports Ubuntu >= Xenial - sh /etc/init.d/xvfb start - echo "Lazarus build (with wine)" - -elif [ "$TRAVIS_OS_NAME" = "osx" ]; then - # OSX build - - brew tap homebrew/cask - brew update - -else - # Linux build - - if [ "$TRAVIS_DIST" = trusty ] ; then - # Adding fpc repository - sudo add-apt-repository -y ppa:ok2cqr/lazarus - - # ffmpeg (2.4) version for trusty - # sudo add-apt-repository -y ppa:kirillshkrogalev/ffmpeg-next - fi - - sudo apt-get update - -fi diff --git a/tools/travis/build.sh b/tools/travis/build.sh deleted file mode 100755 index b2bd925bd..000000000 --- a/tools/travis/build.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -e - -if [ -n "$LAZ_OPT" ]; then - # Lazarus build (with wine) - - lazbuild $LAZ_OPT ./src/ultrastardx-travis.lpi - -elif [ "$TRAVIS_OS_NAME" = "osx" ]; then - # OSX build - - ./autogen.sh - ./configure --enable-osx-brew --with-opencv-cxx-api - make macosx-standalone-app - make macosx-dmg - - if [ -r "UltraStarDeluxe.dmg" ]; then - link=$(curl --upload-file 'UltraStarDeluxe.dmg' "https://transfer.sh/UltraStarDeluxe-$(git rev-parse --short HEAD).dmg") - echo "UltraStarDeluxe.dmg should be available at:" - echo " $link" - fi - -elif [ "$VARIANT" = appimage ] ; then - # Linux build - - git fetch --unshallow --tags - cd dists/linux - - prepend="" - if [ "$TRAVIS_CPU_ARCH" != amd64 ] || [ "$BUILD_32BIT" = yes ] ; then - prepend=./dockerenv.sh - sed -i '/docker/s/-it\>//' dockerenv.sh - - if [ "$BUILD_32BIT" = yes ] ; then - prepend="linux32 $prepend" - fi - fi - - $prepend make compress - set -- UltraStarDeluxe-*.AppImage - filename="$1" - outfile="UltraStarDeluxe-$(git rev-parse --short HEAD)-${filename#*-}" - if [ -r "$filename" ]; then - link="$(curl --upload-file "$filename" "https://transfer.sh/$outfile")" - echo "$outfile should be available at:" - echo " $link" - fi -else - # Linux build - - ./autogen.sh - ./configure --with-opencv-cxx-api --with-libprojectM - make - make install DESTDIR=out -fi diff --git a/tools/travis/install.sh b/tools/travis/install.sh deleted file mode 100755 index bfebe1ea0..000000000 --- a/tools/travis/install.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -DIR=$(dirname $0) - -if [ -n "$LAZ_VER" ]; then - # Lazarus build (with wine) - - $DIR/lazarus/.travis.install.py - -elif [ "$TRAVIS_OS_NAME" = "osx" ]; then - # OSX build - - # already present on travis - #brew cask install xquartz - - brew install sdl2 sdl2_gfx sdl2_image sdl2_mixer sdl2_net sdl2_ttf \ - fpc portaudio binutils freetype libpng lua libtiff opencv \ - portmidi - - # This is from: https://github.com/Homebrew/homebrew-core - brew install ffmpeg@4 - -elif [ "$VARIANT" = appimage ] && [ "$TRAVIS_DIST" = trusty ]; then - # Linux build - - sudo apt-get install \ - fpc \ - cmake \ - build-essential autoconf automake \ - libtool libasound2-dev libx11-dev libxext-dev \ - libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxxf86vm-dev \ - libxss-dev libgl1-mesa-dev libdbus-1-dev libudev-dev \ - libjack-jackd2-dev libpulse-dev \ - libegl1-mesa-dev libgbm-dev libdrm-dev \ - libxkbcommon-dev \ - zlib1g-dev libfreetype6-dev \ - libfuse-dev libcairo2-dev libglib2.0-dev \ - zsync desktop-file-utils libarchive-dev \ - curl realpath - -elif [ "$VARIANT" = appimage ] ; then - # Linux build inside docker container - - sudo apt-get install \ - curl - -else - # Linux build - - # Keep list in sync with README.md. - # No need for git. The source code has already been downloaded. - sudo apt-get install \ - automake make gcc fpc libsdl2-image-dev libavformat-dev \ - libswscale-dev libsqlite3-dev libfreetype6-dev portaudio19-dev \ - libportmidi-dev liblua5.3-dev libopencv-videoio-dev \ - g++ libprojectm-dev libopencv-dev - -fi diff --git a/tools/travis/lazarus b/tools/travis/lazarus deleted file mode 160000 index f59089459..000000000 --- a/tools/travis/lazarus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f590894599815b0b26bac6113fd692924bac832d