From 94e318609060a728c53f4c68e97003ca4fa8061b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 8 Mar 2018 00:26:46 +0100 Subject: [PATCH] Rebuild 32-bit X11 --- .travis.yml | 15 -------- appveyor.yml | 96 ---------------------------------------------------- 2 files changed, 111 deletions(-) delete mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml index e25c216..2e02242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,24 +28,9 @@ env: - OPTIONS="builtin_libpng=yes builtin_openssl=yes builtin_zlib=yes" - SCONS="scons -j2 verbose=no warnings=no progress=no" matrix: - - PLATFORM=iphone TARGET=release - - PLATFORM=iphone TARGET=release_debug - - PLATFORM=javascript TARGET=release - - PLATFORM=javascript TARGET=release_debug - - PLATFORM=osx BITS=fat TOOLS=yes TARGET=release_debug - - PLATFORM=osx BITS=fat TOOLS=no TARGET=release - - PLATFORM=osx BITS=fat TOOLS=no TARGET=release_debug - - PLATFORM=server BITS=64 TOOLS=yes TARGET=release_debug - PLATFORM=x11 BITS=32 TOOLS=yes TARGET=release_debug - PLATFORM=x11 BITS=32 TOOLS=no TARGET=release - PLATFORM=x11 BITS=32 TOOLS=no TARGET=release_debug - - PLATFORM=x11 BITS=64 TOOLS=yes TARGET=release_debug - - PLATFORM=x11 BITS=64 TOOLS=no TARGET=release - - PLATFORM=x11 BITS=64 TOOLS=no TARGET=release_debug - - PLATFORM=android TARGET=release ANDROID_ARCH=armv7 - - PLATFORM=android TARGET=release ANDROID_ARCH=x86 - - PLATFORM=android TARGET=release_debug ANDROID_ARCH=armv7 - - PLATFORM=android TARGET=release_debug ANDROID_ARCH=x86 matrix: exclude: diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index bc5128d..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,96 +0,0 @@ -image: Visual Studio 2017 - -# Skip build on normal pushes -skip_non_tags: true - -artifacts: - - path: godot\bin\*.exe - name: GodotBinary - -environment: - BUILD_REVISION: build2 - VS: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat - PYTHON: C:\Python27 - ANGLE_SRC_PATH: C:\projects\godot-builds\angle - matrix: - - GD_PLATFORM: windows - TOOLS: yes - TARGET: release_debug - ARCH: amd64 - - GD_PLATFORM: windows - TOOLS: yes - TARGET: release_debug - ARCH: x86 - - GD_PLATFORM: windows - TOOLS: no - TARGET: release - ARCH: amd64 - - GD_PLATFORM: windows - TOOLS: no - TARGET: release_debug - ARCH: amd64 - - GD_PLATFORM: windows - TOOLS: no - TARGET: release - ARCH: x86 - - GD_PLATFORM: windows - TOOLS: no - TARGET: release_debug - ARCH: x86 - - GD_PLATFORM: winrt - TOOLS: no - TARGET: release - ARCH: amd64 - - GD_PLATFORM: winrt - TOOLS: no - TARGET: release_debug - ARCH: amd64 - - GD_PLATFORM: winrt - TOOLS: no - TARGET: release - ARCH: x86 - - GD_PLATFORM: winrt - TOOLS: no - TARGET: release_debug - ARCH: x86 - - GD_PLATFORM: winrt - TOOLS: no - TARGET: release - ARCH: amd64_arm - - GD_PLATFORM: winrt - TOOLS: no - TARGET: release_debug - ARCH: amd64_arm - -install: - - set "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - pip install --egg scons # it will fail on AppVeyor without --egg flag - - if defined VS call "%VS%" %ARCH% # if defined - so we can also use mingw - - git submodule update --init --recursive # download submodules - - ps: >- - If ($env:GD_PLATFORM -Match "winrt") { - Start-FileDownload https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z - 7z.exe x angle.7z - } - -before_build: - - echo %BUILD_REVISION% - - echo %GD_PLATFORM% - - python --version - - scons --version - - cl.exe - -build_script: - - cd godot - - for /f %%p in ('dir /b ..\patches') do git apply ..\patches\%%p - - git rev-parse HEAD - - scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% progress=no warnings=no verbose=no - -deploy: - description: 'Godot binaries deployed by Travis CI and AppVeyor' - provider: GitHub - auth_token: - secure: DYTTAkQFPIDq2YL6hPMOttlHdJ9ZL6dYdOtGFIEneO8BTYx6keJRvewsdzgP2QGA - artifact: GodotBinary - on: - appveyor_repo_tag: true