From 1e6be598e9200e6e71707e63001f712522e6462b Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 27 Nov 2021 06:27:52 +0300 Subject: [PATCH] TravisCI is dead too\! --- .travis.yml | 35 ------------ README.md | 2 +- scripts/travis/build_linux.sh | 103 ---------------------------------- scripts/travis/deps_common.sh | 1 - scripts/travis/deps_linux.sh | 4 -- 5 files changed, 1 insertion(+), 144 deletions(-) delete mode 100644 .travis.yml delete mode 100755 scripts/travis/build_linux.sh delete mode 100755 scripts/travis/deps_common.sh delete mode 100755 scripts/travis/deps_linux.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2ac79f6d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -language: c -compiler: gcc -sudo: false -env: - global: - - SDL_VERSION=2.0.14 -git: - depth: 50 - submodules: true - -os: linux -arch: - - aarch64 - - ppc64le - - s390x -addons: - apt: - update: true - packages: - - libx11-dev - - libxext-dev - - x11-utils - - libgl1-mesa-dev - - libasound-dev - - libstdc++6 - - libfuse2 - - unzip -before_script: - - sh scripts/travis/deps_common.sh - - sh scripts/travis/deps_${TRAVIS_OS_NAME}.sh -script: - - sh scripts/travis/build_${TRAVIS_OS_NAME}.sh -after_script: - - ccache --show-stats - - sh scripts/continious_upload.sh xash3d-fwgs-${ARCH}.tar.xz xashds-linux-${ARCH} diff --git a/README.md b/README.md index bf116b86..6e988100 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Xash3D FWGS Engine -[![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![Travis CI Status](https://api.travis-ci.org/FWGS/xash3d-fwgs.svg?branch=master)](https://travis-ci.org/FWGS/xash3d-fwgs) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [![Discord Server](https://img.shields.io/discord/355697768582610945.svg)](http://discord.fwgs.ru/) \ +[![GitHub Actions Status](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/FWGS/xash3d-fwgs/actions/workflows/c-cpp.yml) [![FreeBSD Build Status](https://img.shields.io/cirrus/github/FWGS/xash3d-fwgs?label=freebsd%20build)](https://cirrus-ci.com/github/FWGS/xash3d-fwgs) [![Discord Server](https://img.shields.io/discord/355697768582610945.svg)](http://discord.fwgs.ru/) \ [![Download Stable](https://img.shields.io/badge/download-stable-yellow)](https://github.com/FWGS/xash3d-fwgs/releases/latest) [![Download Testing](https://img.shields.io/badge/downloads-testing-orange)](https://github.com/FWGS/xash3d-fwgs/releases/tag/continuous) Xash3D FWGS is a fork of Xash3D Engine by Unkle Mike with extended features and crossplatform. diff --git a/scripts/travis/build_linux.sh b/scripts/travis/build_linux.sh deleted file mode 100755 index 3da6ed33..00000000 --- a/scripts/travis/build_linux.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -. scripts/lib.sh - -APP=xash3d-fwgs -APPDIR=$APP -APPIMAGE=$APP-$ARCH.tar.xz - -build_sdl2() -{ - cd "$BUILDDIR"/SDL2_src || die - if [ "$ARCH" = "i386" ]; then - export CFLAGS="-msse2 -march=i686 -m32 -ggdb -O2" - export LDFLAGS="-m32" - fi - ./configure \ - --disable-render \ - --disable-haptic \ - --disable-power \ - --disable-filesystem \ - --disable-file \ - --disable-libudev \ - --disable-dbus \ - --disable-ibus \ - --disable-ime \ - --disable-fcitx \ - --enable-alsa-shared \ - --enable-pulseaudio-shared \ - --enable-wayland-shared \ - --enable-x11-shared \ - --prefix / || die # get rid of /usr/local stuff - make -j2 || die - mkdir -p "$BUILDDIR"/SDL2_linux - make install DESTDIR="$BUILDDIR"/SDL2_linux || die - export CFLAGS="" - export LDFLAGS="" -} - -build_engine() -{ - # Build engine - cd "$BUILDDIR" || die - - if [ "$ARCH" = "amd64" ]; then # we need enabling 64-bit target only on Intel-compatible CPUs - AMD64="-8" - fi - - if [ "$1" = "dedicated" ]; then - ./waf configure -T release -d $AMD64 || die - elif [ "$1" = "full" ]; then - ./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils || die - else - die - fi - - ./waf build || die -} - -build_archive() -{ - cd "$BUILDDIR" || die - - ./waf install --prefix="$APPDIR" || die - - # Generate extras.pak - python3 scripts/makepak.py xash-extras/ "$APPDIR/extras.pak" - - cp SDL2_linux/lib/libSDL2-2.0.so.0 "$APPDIR/" - if [ "$ARCH" = "i386" ]; then - cp vgui-dev/lib/vgui.so "$APPDIR/" - fi - - cat > "$APPDIR"/run.sh << 'EOF' -#!/bin/sh - -if [ "$XASH3D_BASEDIR" = "" ]; then - export XASH3D_BASEDIR=$PWD -fi -echo "Xash3D FWGS installed as tarball." -echo "Base directory is $XASH3D_BASEDIR. Set XASH3D_BASEDIR environment variable to override this" - -export XASH3D_EXTRAS_PAK1="${XASH3D_BASEDIR}"/extras.pak -export LD_LIBRARY_PATH="${XASH3D_BASEDIR}":$LD_LIBRARY_PATH -${DEBUGGER} "${XASH3D_BASEDIR}"/xash3d "$@" -exit $? -EOF - - chmod +x "$APPDIR"/xash3d "$APPDIR"/run.sh # Engine launcher & engine launcher script - - echo "Contents of tarball: " - ls -R "$APPDIR" - - tar -cJvf $APPIMAGE $APPDIR/* -} - -rm -rf build # clean-up build directory -build_engine dedicated -mv build/engine/xash xashds-linux-$ARCH - -rm -rf build -build_sdl2 -build_engine full -build_archive diff --git a/scripts/travis/deps_common.sh b/scripts/travis/deps_common.sh deleted file mode 100755 index 719bdcd6..00000000 --- a/scripts/travis/deps_common.sh +++ /dev/null @@ -1 +0,0 @@ -git clone --depth 1 https://github.com/FWGS/xash-extras diff --git a/scripts/travis/deps_linux.sh b/scripts/travis/deps_linux.sh deleted file mode 100755 index 215c9108..00000000 --- a/scripts/travis/deps_linux.sh +++ /dev/null @@ -1,4 +0,0 @@ -# SDL2 sources. We will build our own version -curl http://libsdl.org/release/SDL2-$SDL_VERSION.zip -o SDL2.zip -unzip -q SDL2.zip -mv SDL2-$SDL_VERSION SDL2_src