[Travis CI] Disable some build jobs that are now handled elsewhere

Warzone2100 · Feb 29, 2020 · fb8e2e2 · fb8e2e2
1 parent a7aaec4
commit fb8e2e2
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 237 deletions.
diff --git a/.ci/travis/packaged_source_deploy_prepare.sh b/.ci/travis/packaged_source_deploy_prepare.sh
diff --git a/.travis.yml b/.travis.yml
@@ -22,47 +22,6 @@ matrix:
         - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu make check
         - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu sudo make install
 
-    # Build for Ubuntu 16.04 (CMake) (GCC)
-    - name: "Ubuntu 16.04 (CMake) [GCC]"
-      language: cpp
-      compiler: gcc
-      sudo: required
-      services:
-        - docker
-      install:
-        - cd docker/ubuntu-16.04/
-        - docker build -t ubuntu .
-        - cd ../..
-      script:
-        - export MAKEFLAGS="-j$((`grep -c ^processor /proc/cpuinfo`*2))"
-        # Must supply the TRAVIS environment variables to the docker container so autorevision properly receives the revision info from Travis
-        # To do this, append the following to the pertinent lines after —rm:
-        # -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWZ_ENABLE_WARNINGS:BOOL=ON -G"Ninja"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake --build build
-
-    ## NOTE: The following is commented-out until we solidify how we're caching Docker images
-    ## (The current ubuntu Dockerfile does not install Clang.)
-    ## Build for Ubuntu (CMake) (Clang)
-    #- language: cpp
-    #  env:
-    #    - NAME="Ubuntu (CMake)"
-    #  compiler: clang
-    #  sudo: required
-    #  services:
-    #    - docker
-    #  install:
-    #    - cd docker/ubuntu-16.04/
-    #    - docker build -t ubuntu .
-    #    - cd ../..
-    #  script:
-    #    - export MAKEFLAGS="-j$((`grep -c ^processor /proc/cpuinfo`*2))"
-    #    # Must supply the TRAVIS environment variables to the docker container so autorevision properly receives the revision info from Travis
-    #    # To do this, append the following to the pertinent lines after —rm:
-    #    # -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG
-    #    - docker run --rm -e "CC=clang" -e "CXX=clang++" -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -G"Ninja"
-    #    - docker run --rm -e "CC=clang" -e "CXX=clang++" -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake --build build
-
     # Build for Ubuntu 18.04 (Makefile) (GCC)
     - name: "Ubuntu 18.04 (Makefile) [GCC]"
       language: cpp
@@ -85,25 +44,6 @@ matrix:
         - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu make check
         - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu sudo make install
 
-    # Build for Ubuntu 18.04 (CMake) (Clang)
-    - name: "Ubuntu 18.04 (CMake) [Clang]"
-      language: cpp
-      compiler: clang
-      sudo: required
-      services:
-        - docker
-      install:
-        - cd docker/ubuntu-18.04-clang/
-        - docker build -t ubuntu .
-        - cd ../..
-      script:
-        - export MAKEFLAGS="-j$((`grep -c ^processor /proc/cpuinfo`*2))"
-        # Must supply the TRAVIS environment variables to the docker container so autorevision properly receives the revision info from Travis
-        # To do this, append the following to the pertinent lines after —rm:
-        # -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWZ_ENABLE_WARNINGS:BOOL=ON -G"Ninja"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake --build build
-
     # Build for Ubuntu 18.04 (CMake) (GCC) [ARM64]
     - name: "Ubuntu 18.04 (CMake) [GCC] [ARM64]"
       arch: arm64
@@ -126,81 +66,6 @@ matrix:
         - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWZ_ENABLE_WARNINGS:BOOL=ON -G"Ninja"
         - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake --build build
 
-    # Package source (Ubuntu 18.04, CMake)
-    - name: "Package Source (Ubuntu 18.04, CMake) [GCC]"
-      language: cpp
-      compiler: gcc
-      sudo: required
-      services:
-        - docker
-      install:
-        - cd docker/ubuntu-18.04/
-        - docker build -t ubuntu .
-        - cd ../..
-      before_script:
-        - source .ci/travis/export_build_output_desc.sh
-        # Package the source tarball
-        - export MAKEFLAGS="-j$((`grep -c ^processor /proc/cpuinfo`*2))"
-        # Must supply the TRAVIS environment variables to the docker container so autorevision properly receives the revision info from Travis
-        # To do this, append the following to the pertinent lines after —rm:
-        # -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake -P "/code/.ci/travis/prepare_git_repo.cmake"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=Debug -G"Ninja"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code ubuntu cmake --build build --target package_source
-        # Extract the .tar.xz into a new location
-        - mkdir extracted && tar -xf build/warzone2100.tar.xz -C extracted
-      script:
-        # Attempt a build from the tarball source (using CMake)
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd)/extracted/warzone2100:/code ubuntu cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWZ_ENABLE_WARNINGS:BOOL=ON -G"Ninja"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd)/extracted/warzone2100:/code ubuntu cmake --build build
-        # Prepare the source tarball for deployment
-        - .ci/travis/packaged_source_deploy_prepare.sh "build/warzone2100.tar.xz" "${WZ_BUILD_DESC_PREFIX}-" "tmp/wz_upload"
-      after_success:
-        # Deploy the generated .tar.xz to the buildbot
-        - eval "$(ssh-agent -s)" #start the ssh agent
-        - export DEPLOY_UPLOAD_PATH="${DEPLOY_UPLOAD_PATH}/${WZ_BUILD_DESC_PREFIX}/src/"
-        - .ci/travis/travis_deploy.sh "tmp/wz_upload" "warzone2100-${WZ_BUILD_DESC_PREFIX}-*_src.tar.xz" --cleanold
-
-    # Build for Fedora :LATEST (CMake) (GCC)
-    - name: "Fedora :LATEST (CMake) [GCC]"
-      dist: bionic
-      language: cpp
-      compiler: gcc
-      sudo: required
-      services:
-        - docker
-      install:
-        - cd docker/fedora-latest/
-        - docker build -t fedora .
-        - cd ../..
-      script:
-        - export MAKEFLAGS="-j$((`grep -c ^processor /proc/cpuinfo`*2))"
-        # Must supply the TRAVIS environment variables to the docker container so autorevision properly receives the revision info from Travis
-        # To do this, append the following to the pertinent lines after —rm:
-        # -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code fedora cmake '-H.' -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWZ_ENABLE_WARNINGS:BOOL=ON -G"Ninja"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code fedora cmake --build build
-
-    # Build for Fedora :LATEST (CMake) (GCC) (32-bit -m32 cross-compile)
-    - name: "Fedora :LATEST (CMake) [GCC -m32]"
-      dist: bionic
-      language: cpp
-      compiler: gcc
-      sudo: required
-      services:
-        - docker
-      install:
-        - cd docker/fedora-latest-m32/
-        - docker build -t fedora .
-        - cd ../..
-      script:
-        - export MAKEFLAGS="-j$((`grep -c ^processor /proc/cpuinfo`*2))"
-        # Must supply the TRAVIS environment variables to the docker container so autorevision properly receives the revision info from Travis
-        # To do this, append the following to the pertinent lines after —rm:
-        # -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code fedora cmake '-H.' -Bbuild -DCMAKE_TOOLCHAIN_FILE=.ci/cmake/Toolchain-Linux-cross-m32.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWZ_ENABLE_WARNINGS:BOOL=ON -G"Ninja"
-        - docker run --rm -e CI -e TRAVIS -e "TRAVIS_BUILD_DIR=/code" -e TRAVIS_BRANCH -e TRAVIS_COMMIT -e TRAVIS_PULL_REQUEST_BRANCH -e TRAVIS_TAG -e MAKEFLAGS -v $(pwd):/code fedora cmake --build build
-
     # Build for macOS (CMake)
     - name: "macOS (CMake) [Xcode 8.3, macOS 10.12 SDK]"
       language: objective-c
@@ -225,52 +90,52 @@ matrix:
         - macosx/BuildBot/travis_cmake_build.sh "${WZ_BUILD_DESC_PREFIX}-" "tmp/wz_upload"
       # do not deploy
 
-    # Build for macOS (CMake)
-    # (This also deploys the macOS build to the buildbot)
-    - name: "macOS (CMake) [Xcode 9.4, macOS 10.13 SDK]"
-      language: objective-c
-      os: osx
-      osx_image: xcode9.4
-      env:
-        - MACOSX_DEPLOYMENT_TARGET=10.10
-      before_install:
-        - brew update
-        - if (brew outdated | grep cmake > /dev/null); then echo "upgrading CMake"; brew upgrade cmake; fi
-        - brew install gettext
-        # NOTE: Specify an explicit Asciidoctor version to help ensure reproducible builds
-        - gem install asciidoctor -v 2.0.10 --no-document
-        # gcc6+ is currently required to bootstrap vcpkg on macOS
-        - brew install gcc || brew link --overwrite gcc
-        - bundle install --gemfile="macosx/BuildBot/Gemfile"
-        - cmake --version
-      script:
-        - source .ci/travis/export_build_output_desc.sh
-        - macosx/BuildBot/travis_cmake_build.sh "${WZ_BUILD_DESC_PREFIX}-" "tmp/wz_upload"
-      after_success:
-        - export DEPLOY_UPLOAD_PATH="${DEPLOY_UPLOAD_PATH}/${WZ_BUILD_DESC_PREFIX}/macOS/"
-        - .ci/travis/travis_deploy.sh "tmp/wz_upload" "warzone2100-${WZ_BUILD_DESC_PREFIX}-*_macOS.zip" --cleanold
-
-    # Build for macOS (CMake)
-    - name: "macOS (CMake) [Xcode 10.3, macOS 10.14 SDK]"
-      language: objective-c
-      os: osx
-      osx_image: xcode10.3
-      env:
-        - MACOSX_DEPLOYMENT_TARGET=10.10
-      before_install:
-        - brew update
-        - if (brew outdated | grep cmake > /dev/null); then echo "upgrading CMake"; brew upgrade cmake; fi
-        - brew install gettext
-        # NOTE: Specify an explicit Asciidoctor version to help ensure reproducible builds
-        - gem install asciidoctor -v 2.0.10 --no-document
-        # gcc6+ is currently required to bootstrap vcpkg on macOS
-        - brew install gcc || brew link --overwrite gcc
-        - bundle install --gemfile="macosx/BuildBot/Gemfile"
-        - cmake --version
-      script:
-        - source .ci/travis/export_build_output_desc.sh
-        - macosx/BuildBot/travis_cmake_build.sh "${WZ_BUILD_DESC_PREFIX}-" "tmp/wz_upload"
-      # do not deploy
+    # # Build for macOS (CMake)
+    # # (This also deploys the macOS build to the buildbot)
+    # - name: "macOS (CMake) [Xcode 9.4, macOS 10.13 SDK]"
+    #   language: objective-c
+    #   os: osx
+    #   osx_image: xcode9.4
+    #   env:
+    #     - MACOSX_DEPLOYMENT_TARGET=10.10
+    #   before_install:
+    #     - brew update
+    #     - if (brew outdated | grep cmake > /dev/null); then echo "upgrading CMake"; brew upgrade cmake; fi
+    #     - brew install gettext
+    #     # NOTE: Specify an explicit Asciidoctor version to help ensure reproducible builds
+    #     - gem install asciidoctor -v 2.0.10 --no-document
+    #     # gcc6+ is currently required to bootstrap vcpkg on macOS
+    #     - brew install gcc || brew link --overwrite gcc
+    #     - bundle install --gemfile="macosx/BuildBot/Gemfile"
+    #     - cmake --version
+    #   script:
+    #     - source .ci/travis/export_build_output_desc.sh
+    #     - macosx/BuildBot/travis_cmake_build.sh "${WZ_BUILD_DESC_PREFIX}-" "tmp/wz_upload"
+    #   after_success:
+    #     - export DEPLOY_UPLOAD_PATH="${DEPLOY_UPLOAD_PATH}/${WZ_BUILD_DESC_PREFIX}/macOS/"
+    #     - .ci/travis/travis_deploy.sh "tmp/wz_upload" "warzone2100-${WZ_BUILD_DESC_PREFIX}-*_macOS.zip" --cleanold
+    #
+    # # Build for macOS (CMake)
+    # - name: "macOS (CMake) [Xcode 10.3, macOS 10.14 SDK]"
+    #   language: objective-c
+    #   os: osx
+    #   osx_image: xcode10.3
+    #   env:
+    #     - MACOSX_DEPLOYMENT_TARGET=10.10
+    #   before_install:
+    #     - brew update
+    #     - if (brew outdated | grep cmake > /dev/null); then echo "upgrading CMake"; brew upgrade cmake; fi
+    #     - brew install gettext
+    #     # NOTE: Specify an explicit Asciidoctor version to help ensure reproducible builds
+    #     - gem install asciidoctor -v 2.0.10 --no-document
+    #     # gcc6+ is currently required to bootstrap vcpkg on macOS
+    #     - brew install gcc || brew link --overwrite gcc
+    #     - bundle install --gemfile="macosx/BuildBot/Gemfile"
+    #     - cmake --version
+    #   script:
+    #     - source .ci/travis/export_build_output_desc.sh
+    #     - macosx/BuildBot/travis_cmake_build.sh "${WZ_BUILD_DESC_PREFIX}-" "tmp/wz_upload"
+    #   # do not deploy
 
 # The channel name "chat.freenode.net#warzone2100-dev" is encrypted against Warzone2100/warzone2100 to prevent IRC spam of forks
 notifications: