diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 84b075cb63..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: cpp - -os: linux - -cache: ccache - -dist: xenial - -# build only master branch -branches: - only: - - master - -jobs: - include: - - env: VERSION=8 BITS=64 - compiler: gcc - - env: VERSION=8 BITS=32 - compiler: gcc - - env: VERSION=7 BITS=32 - compiler: gcc - - env: VERSION=3.8 BITS=32 - compiler: clang - -before_install: - - ./travis.sh before_install - -before_script: - - ./travis.sh before_script - -script: - - ./travis.sh script - -after_success: - - ./travis.sh after_success diff --git a/README.md b/README.md index d15fd35015..9d71792761 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ ![Windows Build](https://github.com/PCSX2/pcsx2/workflows/Windows%20Build/badge.svg) ![Linux Build](https://github.com/PCSX2/pcsx2/workflows/Linux%20Build/badge.svg) [![Coverity Scan Build Status](https://scan.coverity.com/projects/6310/badge.svg)](https://scan.coverity.com/projects/6310) -[![Travis Build Status](https://travis-ci.org/PCSX2/pcsx2.svg?branch=master)](https://travis-ci.org/PCSX2/pcsx2) -[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/b67odm0dd506co78/branch/master?svg=true)](https://ci.appveyor.com/project/gregory38/pcsx2/branch/master) PCSX2 is a free and open-source PlayStation 2 (PS2) emulator. Its purpose is to emulate the PS2's hardware, using a combination of MIPS CPU [Interpreters](), [Recompilers](https://en.wikipedia.org/wiki/Dynamic_recompilation) and a [Virtual Machine](https://en.wikipedia.org/wiki/Virtual_machine) which manages hardware states and PS2 system memory. This allows you to play PS2 games on your PC, with many additional features and benefits. diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ad4b3b34a6..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,63 +0,0 @@ -# Static build version - changing the version dynamically means you can't -# just click from github to see how things are progressing until the build has -# finished, which could be a bit annoying. -version: 1.{build}-{branch} - -# Do not build feature branch with open Pull Requests -skip_branch_with_pr: true - -# build only master branch -branches: - only: - - master - -# Skip building commits if only the following directories/files are changed -skip_commits: - files: - - .gitignore - - .travis.yml - - .clang-format - - '**/*.md' - - debian-packager/ - - bin/PCSX2_keys.ini.default - # Linux only plugins for now - - plugins/onepad/ - - plugins/onepad_legacy/ - -environment: - matrix: - - platform: Win32 - target: AppVeyor - visualstudio_string: vs2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - - platform: x64 - target: AppVeyor - visualstudio_string: vs2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - -matrix: - fast_finish: true - -init: -# Use CRLF line endings on Windows so users can just use Notepad. - - git config --global core.autocrlf true - -install: - - git submodule update --init --recursive - -build_script: - - msbuild buildbot.xml /m /t:%target% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - -after_build: - - ps: $env:gitrev = git describe --tags - - ps: $env:my_version = "$env:gitrev-$env:appveyor_build_number" - - type NUL > bin\portable.ini - - set folder_name=pcsx2-%my_version%-%visualstudio_string%-%platform%-%target% - - rename bin %folder_name% - - 7z a -mx9 %folder_name%.7z %folder_name% - -test: off - -artifacts: - - path: $(folder_name).7z - name: $(visualstudio_string)-$(target) diff --git a/travis.sh b/travis.sh deleted file mode 100755 index 936c3e2aa0..0000000000 --- a/travis.sh +++ /dev/null @@ -1,160 +0,0 @@ -#!/bin/sh - -set -ex - -# Disabled for now -clang_syntax_check() { - if [ "${CXX}" = "clang++" ]; then - ./linux_various/check_format.sh - fi -} - -linux_32_before_install() { - # Build worker is 64-bit only by default it seems. - sudo dpkg --add-architecture i386 - - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - # Compilers - if [ "${CXX}" = "clang++" ]; then - #sudo apt-key adv --fetch-keys http://apt.llvm.org/llvm-snapshot.gpg.key - #sudo add-apt-repository -y "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-${VERSION} main" - #COMPILER_PACKAGE="g++-8-multilib clang-format-${VERSION}" - COMPILER_PACKAGE="g++-8-multilib" - fi - if [ "${CXX}" = "g++" ]; then - COMPILER_PACKAGE="g++-${VERSION}-multilib" - fi - - sudo apt-get -qq update - - # The 64-bit versions of the first 7 dependencies are part of the initial - # build image. libgtk2.0-dev:i386 and libsdl2-dev:i386 require the 32-bit - # versions of the dependencies, and the 2 versions conflict. So those - # dependencies must be explicitly installed. - # Sometimes it complains about Python so we install that too. - sudo apt-get -y install \ - gir1.2-freedesktop:i386 \ - gir1.2-gdkpixbuf-2.0:i386 \ - gir1.2-glib-2.0:i386 \ - libcairo2-dev:i386 \ - libegl1-mesa-dev:i386 \ - libgdk-pixbuf2.0-dev:i386 \ - libgirepository-1.0-1:i386 \ - libglib2.0-dev:i386 \ - libaio-dev:i386 \ - libasound2-dev:i386 \ - libgl1-mesa-dev:i386 \ - libglu1-mesa-dev:i386 \ - libgtk2.0-dev:i386 \ - liblzma-dev:i386 \ - libharfbuzz-dev:i386 \ - libpango1.0-dev:i386 \ - libpng12-dev:i386 \ - libsdl2-dev:i386 \ - libsoundtouch-dev:i386 \ - libsamplerate0-dev:i386 \ - libwxgtk3.0-dev:i386 \ - libxext-dev:i386 \ - libxft-dev:i386 \ - portaudio19-dev:i386 \ - python:i386 \ - zlib1g-dev:i386 \ - libxml2-dev:i386 \ - libpcap0.8-dev:i386 \ - ${COMPILER_PACKAGE} - - # Manually add ccache symlinks for clang - if [ "${CXX}" = "clang++" ]; then - sudo ln -sf ../../bin/ccache /usr/lib/ccache/${CXX} - sudo ln -sf ../../bin/ccache /usr/lib/ccache/${CC} - fi -} - -linux_32_script() { - mkdir build - cd build - - # Prevents warning spam - if [ "${CXX}" = "clang++" ]; then - export CCACHE_CPP2=yes - export CC=${CC} CXX=${CXX} - else - export CC=${CC}-${VERSION} CXX=${CXX}-${VERSION} - fi - cmake \ - -DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_REPLAY_LOADERS=TRUE \ - -DCMAKE_BUILD_PO=FALSE \ - -DGTK2_API=TRUE \ - .. - - # Documentation says 1.5 cores, so 2 or 3 threads should work ok. - make -j3 install -} - - -linux_64_before_install() { - # Compilers - if [ "${CXX}" = "g++" ]; then - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - COMPILER_PACKAGE="g++-${VERSION}" - fi - - sudo apt-get -qq update - - # libgl1-mesa-dev, liblzma-dev, libxext-dev, zlib1g-dev already installed on - # build worker, I put these here in case the build image changes. - sudo apt-get -y install \ - libaio-dev \ - libasound2-dev \ - libegl1-mesa-dev \ - libgtk2.0-dev \ - libpng12-dev \ - libsdl2-dev \ - libsoundtouch-dev \ - libsamplerate0-dev \ - libwxgtk3.0-dev \ - portaudio19-dev \ - libxml2-dev \ - libpcap0.8-dev \ - ${COMPILER_PACKAGE} -} - - -linux_64_script() { - mkdir build - cd build - - export CC=${CC}-${VERSION} CXX=${CXX}-${VERSION} - cmake \ - -DCMAKE_BUILD_TYPE=Devel \ - -DBUILD_REPLAY_LOADERS=TRUE \ - -DCMAKE_BUILD_PO=FALSE \ - -DGTK2_API=TRUE \ - .. - - # Documentation says 1.5 cores, so 2 or 3 threads should work ok. - make -j3 install -} - -linux_after_success() { - ccache -s -} - -# Just in case I do manual testing and accidentally insert "rm -rf /" -case "${1}" in -before_install|script) - ${TRAVIS_OS_NAME}_${BITS}_${1} - ;; -before_script) -# clang_syntax_check - ;; -after_success) - ${TRAVIS_OS_NAME}_${1} - ;; -*) - echo "Unknown command" && false - ;; -esac