From 4d0dfaf1cb9af979a827c0b0371aacf4fe9b2724 Mon Sep 17 00:00:00 2001 From: razor Date: Tue, 17 Oct 2023 00:20:55 +1100 Subject: [PATCH] remove old CI files (travis, appveyor) (#1180) --- .travis.yml | 49 ------------------------ appveyor.yml | 74 ------------------------------------- scripts/appveyor/deploy.bat | 20 ---------- scripts/travis/build.sh | 48 ------------------------ scripts/travis/install.sh | 52 -------------------------- 5 files changed, 243 deletions(-) delete mode 100644 .travis.yml delete mode 100644 appveyor.yml delete mode 100644 scripts/appveyor/deploy.bat delete mode 100755 scripts/travis/build.sh delete mode 100755 scripts/travis/install.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4dbb097d33..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -language: cpp -sudo: required -dist: bionic - -addons: - homebrew: - update: true - packages: - - libpng - - sdl2 - -install: - - if [[ "${TRAVIS_OS_NAME}" != "osx" ]]; then ./scripts/travis/install.sh "${host:-native}" $opts; fi -script: ./scripts/travis/build.sh "${host:-native}" "${flavour:-Release}" $opts - -matrix: - include: - # Linux x64 Release - - os: linux - compiler: gcc - - # macOS - - os: osx - osx_image: xcode9.4 - compiler: clang - - # Linux x64 Debug - - os: linux - compiler: gcc - env: flavour=Debug - - # Linux i686 gcc - - os: linux - compiler: gcc - env: host=i686-linux-gnu - - # Linux x64 mingw32 - - os: linux - compiler: gcc - env: host=x86_64-w64-mingw32 - - # Linux i686 mingw32 - - os: linux - compiler: gcc - env: host=i686-w64-mingw32 - - # Linux clang - - os: linux - compiler: clang diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index e0b9601c6e..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,74 +0,0 @@ -version: 1.0.{build} - -branches: - except: - - release/1.0 - -clone_depth: 1 -shallow_clone: true - -#do not build on tags -skip_tags: true - -os: Visual Studio 2013 - -environment: - VisualStudioVersion: "12.0" - CMAKE_GENERATOR: "Visual Studio 12 2013" - -matrix: - fast_finish: false #finish build once one of the jobs fails - -platform: - - Win32 - - x64 - -configuration: - - Debug - - Release - -init: - - ps: $env:SHORT_COMMIT_HASH=$env:appveyor_repo_commit.substring(0,8) - - ps: Update-AppveyorBuild -Version "1.0-git-$env:SHORT_COMMIT_HASH" - - ps: $env:ARTIFACT_FILE="openjk-$(Get-Date -UFormat "%Y-%m-%d")-$env:SHORT_COMMIT_HASH-windows.zip" - - echo "Artifact file='%ARTIFACT_FILE%'" - - cmake --version - - msbuild /version - -clone_folder: C:\projects\OpenJK - -#scripts to run before build -before_build: - - cd %APPVEYOR_BUILD_FOLDER% - - if "%Platform%"=="x64" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64" - - echo "Generator='%CMAKE_GENERATOR%'" - - echo "Platform='%Platform%'" - - if exist build rmdir /q /s build #remove build dir - - mkdir build - - cd build - - cmake -DCMAKE_INSTALL_PREFIX=install -G "%CMAKE_GENERATOR%" "%APPVEYOR_BUILD_FOLDER%" - - ls - -build: - parallel: true - project: C:\projects\OpenJK\build\OpenJK.sln - verbosity: normal - -after_build: - - cmake --build . --target INSTALL --config %CONFIGURATION% - - cd %APPVEYOR_BUILD_FOLDER% - - 7z a %ARTIFACT_FILE% %APPVEYOR_BUILD_FOLDER%/build/install/JediAcademy/* - - 7z l %ARTIFACT_FILE% # list files in the zip file - -artifacts: - - path: openjk-*-windows.zip - name: OpenJK Jedi Academy ZIP - type: zip - -deploy_script: - - ps: $key = $env:DeploymentKey - - ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----" + "`n" - - ps: for ($i = 0; $i -lt $key.Length / 64; $i++) { $min = [math]::min(64, $key.Length - ($i * 64)); $fileContent += $key.substring($i*64, $min) + "`n"; } - - ps: $fileContent += "-----END RSA PRIVATE KEY-----" + "`n" - - ps: Set-Content C:\users\appveyor\.ssh\id_rsa $fileContent - - scripts/appveyor/deploy.bat %ARTIFACT_FILE% diff --git a/scripts/appveyor/deploy.bat b/scripts/appveyor/deploy.bat deleted file mode 100644 index 57d2d3a2b6..0000000000 --- a/scripts/appveyor/deploy.bat +++ /dev/null @@ -1,20 +0,0 @@ -setlocal -set CYGWIN_ROOT=C:\cygwin -set WIN32_ROOT=/cygdrive/c -set DEPLOY_LOCATION=ojkwinbuilder@upload.openjk.org:/home/ojkwinbuilder/builds/ -set ZIP_FILE=%1 - -echo Scheduled build: "%APPVEYOR_SCHEDULED_BUILD%" -echo Platform: "%PLATFORM%" -echo Configuration: "%CONFIGURATION%" - -if not "%APPVEYOR_SCHEDULED_BUILD%"=="True" goto end -if not "%PLATFORM%"=="Win32" goto end -if not "%CONFIGURATION%"=="Release" goto end - -echo Deploying %ZIP_FILE% -%CYGWIN_ROOT%\setup-x86.exe -qnNdO -R %CYGWIN_ROOT% -s http://cygwin.mirror.constant.com -l %CYGWIN_ROOT%/var/cache/setup -P rsync -%CYGWIN_ROOT%\bin\bash -lc 'rsync -avz --progress -e "ssh -p 29022 -o StrictHostKeyChecking=no -i %WIN32_ROOT%/users/appveyor/.ssh/id_rsa" -p --chmod=0644 --protocol=29 %WIN32_ROOT%/projects/openjk/%ZIP_FILE% "%DEPLOY_LOCATION%"' - -:end - diff --git a/scripts/travis/build.sh b/scripts/travis/build.sh deleted file mode 100755 index a887e97f00..0000000000 --- a/scripts/travis/build.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -set -e -set -x - -host="$1" -flavour="$2" -shift 2 - -mkdir deps build - -case "${host}" in - (*-w64-mingw32) - export CC=${host}-gcc - export CXX=${host}-g++ - set -- \ - -D CMAKE_TOOLCHAIN_FILE=$(pwd)/cmake/Toolchains/${host}.cmake \ - "$@" - ;; - - (i?86-linux-gnu) - set -- \ - -D CMAKE_TOOLCHAIN_FILE=$(pwd)/cmake/Toolchains/linux-i686.cmake \ - "$@" - ;; - - (native) - ;; - - (*) - set +x - echo "Error: don't know how to cross-compile for ${host} host" - exit 1 - ;; -esac - -set -- -D CMAKE_BUILD_TYPE="$flavour" "$@" - -# Build JK2, so that the CI build is testing everything -( cd build && cmake \ - -D BuildJK2SPEngine=ON \ - -D BuildJK2SPGame=ON \ - -D BuildJK2SPRdVanilla=ON \ - -D CMAKE_INSTALL_PREFIX=/prefix \ - "$@" .. ) -make -C build -make -C build install DESTDIR=$(pwd)/build/DESTDIR -( cd $(pwd)/build/DESTDIR && find . -ls ) diff --git a/scripts/travis/install.sh b/scripts/travis/install.sh deleted file mode 100755 index 9bcabc73fd..0000000000 --- a/scripts/travis/install.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -set -e -set -x - -host="$1" -shift 1 - -sudo apt-get update -yq - -# This is what Travis does using the apt-addon. Didn't want to duplicate a load -# of packages in the .travis.yml file though so we have this script instead. -APT_INSTALL='sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install' - -${APT_INSTALL} cmake - -case "${host}" in - (native) - ${APT_INSTALL} \ - libsdl2-dev \ - libjpeg-turbo8-dev \ - zlib1g-dev \ - libpng-dev - ;; - - (i686-w64-mingw32) - ${APT_INSTALL} g++-mingw-w64-i686 - ;; - - (x86_64-w64-mingw32) - ${APT_INSTALL} g++-mingw-w64-x86-64 - ;; - - (i?86-linux-gnu) - ${APT_INSTALL} \ - libglib2.0-dev:i386 \ - libgl1-mesa-dev:i386 \ - libpulse-dev:i386 \ - libglu1-mesa-dev:i386 \ - libsdl2-dev:i386 \ - libjpeg-turbo8-dev:i386 \ - zlib1g-dev:i386 \ - libc6-dev:i386 \ - libpng-dev:i386 \ - cpp \ - g++ \ - g++-multilib \ - gcc \ - gcc-multilib \ - ${NULL+} - ;; -esac