ci: remove outdated travis-specific code (#16869)

This commit is contained in:
dundargoc 2022-01-01 18:42:26 +01:00 committed by GitHub
parent 302beaa36b
commit f86039de1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 28 deletions

View File

@ -17,8 +17,7 @@ echo 'Python info:'
pyenv versions pyenv versions
) 2>&1 | sed 's/^/ /' || true ) 2>&1 | sed 's/^/ /' || true
# Use pyenv, but not for OSX on Travis, where it only has the "system" version. if command -v pyenv; then
if [[ "${TRAVIS_OS_NAME}" != osx ]] && command -v pyenv; then
echo 'Setting Python versions via pyenv' echo 'Setting Python versions via pyenv'
# Prefer Python 2 over 3 (more conservative). # Prefer Python 2 over 3 (more conservative).
@ -38,7 +37,7 @@ fi
echo "Install node (LTS)" echo "Install node (LTS)"
if [[ "${TRAVIS_OS_NAME}" == osx ]] || [ ! -f ~/.nvm/nvm.sh ]; then if [ ! -f ~/.nvm/nvm.sh ]; then
curl -o ~/.nvm/nvm.sh https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh curl -o ~/.nvm/nvm.sh https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh
fi fi

View File

@ -6,12 +6,6 @@ set -o pipefail
CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${CI_DIR}/common/build.sh" source "${CI_DIR}/common/build.sh"
# Enable ipv6 on Travis. ref: a39c8b7ce30d
if test -n "${TRAVIS_OS_NAME}" && ! test "${TRAVIS_OS_NAME}" = osx ; then
echo "before_script.sh: enable ipv6"
sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
fi
# Test some of the configuration variables. # Test some of the configuration variables.
if [[ -n "${GCOV}" ]] && [[ ! $(type -P "${GCOV}") ]]; then if [[ -n "${GCOV}" ]] && [[ ! $(type -P "${GCOV}") ]]; then
echo "\$GCOV: '${GCOV}' is not executable." echo "\$GCOV: '${GCOV}' is not executable."
@ -27,13 +21,6 @@ ccache -s
# Reset ccache stats for real results in before_cache. # Reset ccache stats for real results in before_cache.
ccache --zero-stats ccache --zero-stats
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
# Adds user to a dummy group.
# That allows to test changing the group of the file by `os_fchown`.
sudo dscl . -create /Groups/chown_test
sudo dscl . -append /Groups/chown_test GroupMembership "${USER}"
fi
# Compile dependencies. # Compile dependencies.
build_deps build_deps

View File

@ -8,10 +8,6 @@ if [[ "${CI_TARGET}" == lint ]]; then
exit exit
fi fi
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
export PATH="/usr/local/opt/ccache/libexec:$PATH"
fi
# Use default CC to avoid compilation problems when installing Python modules. # Use default CC to avoid compilation problems when installing Python modules.
echo "Install neovim module for Python 3." echo "Install neovim module for Python 3."
CC=cc python3 -m pip -q install --user --upgrade pynvim CC=cc python3 -m pip -q install --user --upgrade pynvim

View File

@ -3,14 +3,7 @@
set -e set -e
set -o pipefail set -o pipefail
# This will pass the environment variables down to a bash process which runs ci/run_${CI_TARGET}.sh
# as $USER, while retaining the environment variables defined and belonging
# to secondary groups given above in usermod.
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
sudo -E su "${USER}" -c "ci/run_${CI_TARGET}.sh"
else
ci/run_${CI_TARGET}.sh
fi
if [[ -s "${GCOV_ERROR_FILE}" ]]; then if [[ -s "${GCOV_ERROR_FILE}" ]]; then
echo '=== Unexpected gcov errors: ===' echo '=== Unexpected gcov errors: ==='