فهرست منبع

Merge pull request #40535 from akien-mga/ci-drop-appveyor-travis-desktop

CI: Drop AppVeyor and desktop Travis builds
Rémi Verschelde 5 سال پیش
والد
کامیت
115ad47a0c
6فایلهای تغییر یافته به همراه4 افزوده شده و 156 حذف شده
  1. 0 55
      .appveyor.yml
  2. 2 2
      .github/workflows/main.yml
  3. 2 56
      .travis.yml
  4. 0 0
      misc/ci/android-tools-linux.sh
  5. 0 0
      misc/ci/sources.list
  6. 0 43
      misc/travis/ccache-osx.sh

+ 0 - 55
.appveyor.yml

@@ -1,55 +0,0 @@
-image: Visual Studio 2019
-
-platform: x64
-
-environment:
-  HOME: "%HOMEDRIVE%%HOMEPATH%"
-  PYTHON: C:\Python38
-  SCONS_CACHE_ROOT: "%HOME%\\scons_cache"
-  SCONS_CACHE_LIMIT: 1024
-  OPTIONS: "debug_symbols=no verbose=yes progress=no"
-  EXTRA_ARGS: "warnings=all werror=yes"
-  matrix:
-  - GD_PLATFORM: windows
-    TARGET: release_debug
-    TOOLS: yes
-# Disabled for performance reasons until master is more stable.
-#  - GD_PLATFORM: windows
-#    TARGET: release
-#    TOOLS: no
-
-matrix:
-  fast_finish: true
-
-init:
-  - ps: if ($env:APPVEYOR_REPO_BRANCH -ne "master") { $env:APPVEYOR_CACHE_SKIP_SAVE = "true" }
-
-cache:
-  - "%SCONS_CACHE_ROOT%"
-
-install:
-  - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-  - pip install -U wheel  # needed for pip install scons to work, otherwise a flag is missing
-  - pip install scons # use stable scons
-  - if defined VS call "%VS%" %ARCH%  # if defined - so we can also use mingw
-
-before_build:
-  - echo %GD_PLATFORM%
-  - python --version
-  - scons --version
-  - set "SCONS_CACHE=%SCONS_CACHE_ROOT%\%APPVEYOR_REPO_BRANCH%"
-
-build_script:
-  - scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% %OPTIONS% %EXTRA_ARGS%
-
-after_build:
-  - git rev-parse --short=9 HEAD > VERSION_HASH.txt
-  - set /P VERSION_HASH= < VERSION_HASH.txt
-  - cd bin
-  - mv godot.windows.opt.tools.64.exe godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.exe
-  - 7z a -mx9 godot_%APPVEYOR_REPO_BRANCH%-%VERSION_HASH%_win64.zip *.exe
-
-artifacts:
-  - path: bin/godot_${APPVEYOR_REPO_BRANCH}-${VERSION_HASH}_win64.zip
-    name: Win64 release_debug editor build
-    type: zip

+ 2 - 2
.github/workflows/main.yml

@@ -219,7 +219,7 @@ jobs:
       # Azure repositories are not reliable, we need to prevent azure giving us packages.
       - name: Make apt sources.list use the default Ubuntu repositories
         run: |
-          sudo cp -f misc/scripts/sources.list /etc/apt/sources.list
+          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
           sudo apt-get update
 
       # Install all packages (except scons)
@@ -276,7 +276,7 @@ jobs:
       # Azure repositories are not reliable, we need to prevent azure giving us packages.
       - name: Make apt sources.list use the default Ubuntu repositories
         run: |
-          sudo cp -f misc/scripts/sources.list /etc/apt/sources.list
+          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
           sudo apt-get update
 
       # Install all packages (except scons)

+ 2 - 56
.travis.yml

@@ -11,7 +11,6 @@ env:
     - SCONS_CACHE=$HOME/.scons_cache/$TRAVIS_BRANCH
     - SCONS_CACHE_LIMIT=1024
     - OPTIONS="debug_symbols=no verbose=yes progress=no"
-    - secure: "uch9QszCgsl1qVbuzY41P7S2hWL2IiNFV4SbAYRCdi0oJ9MIu+pVyrQdpf3+jG4rH6j4Rffl+sN17Zz4dIDDioFL1JwqyCqyCyswR8uACC0Rr8gr4Mi3+HIRbv+2s2P4cIQq41JM8FJe84k9jLEMGCGh69w+ibCWoWs74CokYVA="
 
 cache:
   directories:
@@ -19,32 +18,6 @@ cache:
 
 matrix:
   include:
-    - name: Linux editor (debug, GCC 9, with Mono)
-      stage: build
-      env: PLATFORM=linuxbsd TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-mono-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="module_mono_enabled=yes mono_glue=no warnings=extra werror=yes"
-      os: linux
-      compiler: gcc-9
-      addons:
-        apt:
-          sources:
-            - sourceline: "deb https://download.mono-project.com/repo/ubuntu stable-bionic main"
-              key_url: "https://raw.githubusercontent.com/travis-ci/apt-source-safelist/master/keys/mono.asc"
-            - sourceline: "ppa:ubuntu-toolchain-r/test"
-          packages:
-            - &gcc9_deps [gcc-9, g++-9]
-            - &linux_deps [libasound2-dev, libgl1-mesa-dev, libglu1-mesa-dev, libx11-dev, libxcursor-dev, libxi-dev, libxinerama-dev, libxrandr-dev]
-            - &linux_mono_deps [mono-devel, msbuild, nuget]
-
-    - name: Linux export template (release, Clang 7)
-      stage: build
-      env: PLATFORM=linuxbsd TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
-      os: linux
-      compiler: clang
-      addons:
-        apt:
-          packages:
-            - *linux_deps
-
     - name: Android export template (release_debug, Clang)
       stage: build
       env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
@@ -55,18 +28,6 @@ matrix:
           packages:
             - openjdk-8-jdk
 
-    - name: macOS editor (debug, Clang)
-      stage: build
-      env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes"
-      os: osx
-      osx_image: xcode11.5
-      compiler: clang
-      addons:
-        homebrew:
-          packages:
-            - scons
-          update: true
-
 # TODO: iOS MoltenVK support
 
 #    - name: iOS export template (debug, Clang)
@@ -80,16 +41,6 @@ matrix:
 #          packages:
 #            - scons
 
-    - name: Linux export template (release_debug, GCC 7, without 3D support)
-      stage: build
-      env: PLATFORM=linuxbsd TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-7 EXTRA_ARGS="disable_3d=yes"
-      os: linux
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - *linux_deps
-
     - name: JavaScript export template (release, emscripten latest)
       stage: build
       env: PLATFORM=javascript TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-emcc-latest EXTRA_ARGS="use_closure_compiler=yes"
@@ -113,7 +64,7 @@ install:
       export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64;
       export PATH=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:${PATH};
       java -version;
-      misc/travis/android-tools-linux.sh;
+      misc/ci/android-tools-linux.sh;
     fi
   - if [ "$PLATFORM" = "javascript" ]; then
       git clone --depth 1 "https://github.com/emscripten-core/emsdk.git";
@@ -128,9 +79,4 @@ before_script:
     fi
 
 script:
-  - scons -j2 CC=$CC CXX=$CXX platform=$PLATFORM tools=$TOOLS target=$TARGET $OPTIONS $EXTRA_ARGS &&
-    if [ "$TEST_PROJECT" = "yes" ]; then
-      git clone --depth 1 "https://github.com/godotengine/godot-tests.git";
-      sed -i "s:custom_template/release=\"\":custom_template/release=\"$(readlink -e bin/godot_server.linuxbsd.opt.tools.64)\":" godot-tests/tests/project_export/export_presets.cfg;
-      godot-tests/tests/project_export/test_project.sh "bin/godot_server.linuxbsd.opt.tools.64";
-    fi
+  - scons -j2 CC=$CC CXX=$CXX platform=$PLATFORM tools=$TOOLS target=$TARGET $OPTIONS $EXTRA_ARGS

+ 0 - 0
misc/travis/android-tools-linux.sh → misc/ci/android-tools-linux.sh


+ 0 - 0
misc/scripts/sources.list → misc/ci/sources.list


+ 0 - 43
misc/travis/ccache-osx.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-echo
-echo "Download and install ccache ..."
-echo
-
-echo "Downloading sources ..."
-curl -L -O https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.gz # latest version available here: https://ccache.samba.org/download.html
-
-echo "Extracting to build directory ..."
-tar xzf ccache-3.3.4.tar.gz
-cd ccache-3.3.4
-
-echo "Compiling sources ..."
-./configure --prefix=/usr/local --with-bundled-zlib > /dev/null
-make
-
-echo "Installing ..."
-
-mkdir /usr/local/opt/ccache
-
-mkdir /usr/local/opt/ccache/bin
-cp ccache /usr/local/opt/ccache/bin
-ln -s /usr/local/opt/ccache/bin/ccache /usr/local/bin/ccache
-
-mkdir /usr/local/opt/ccache/libexec
-links=(
-  clang
-  clang++
-  cc
-  gcc gcc2 gcc3 gcc-3.3 gcc-4.0 gcc-4.2 gcc-4.3 gcc-4.4 gcc-4.5 gcc-4.6 gcc-4.7 gcc-4.8 gcc-4.9 gcc-5 gcc-6 gcc-7
-  c++ c++3 c++-3.3 c++-4.0 c++-4.2 c++-4.3 c++-4.4 c++-4.5 c++-4.6 c++-4.7 c++-4.8 c++-4.9 c++-5 c++-6 c++-7
-  g++ g++2 g++3 g++-3.3 g++-4.0 g++-4.2 g++-4.3 g++-4.4 g++-4.5 g++-4.6 g++-4.7 g++-4.8 g++-4.9 g++-5 g++-6 g++-7
-)
-for link in "${links[@]}"; do
-  ln -s ../bin/ccache /usr/local/opt/ccache/libexec/$link
-done
-#/usr/local/bin/ccache -M 2G
-cd $TRAVIS_BUILD_DIR
-
-echo
-echo "Done!"
-echo