diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-11-24 22:42:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 22:42:40 -0500 |
| commit | 11e64de511461999b95feaaa4880a820604a7138 (patch) | |
| tree | f2a93092b54171a9e329461986633502e2eb8733 /ci | |
| parent | 7caa622afcbbc1f789c24a3f29525759486208da (diff) | |
| parent | 0bb565b13bcc7a199bf997a67b9a6039d584b84e (diff) | |
| download | rneovim-11e64de511461999b95feaaa4880a820604a7138.tar.gz rneovim-11e64de511461999b95feaaa4880a820604a7138.tar.bz2 rneovim-11e64de511461999b95feaaa4880a820604a7138.zip | |
Merge pull request #13373 from jamessan/github-actions
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/before_script.sh | 2 | ||||
| -rw-r--r-- | ci/common/build.sh | 2 | ||||
| -rw-r--r-- | ci/common/test.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ci/before_script.sh b/ci/before_script.sh index 8bab1c4e17..701fe1d9eb 100755 --- a/ci/before_script.sh +++ b/ci/before_script.sh @@ -7,7 +7,7 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${CI_DIR}/common/build.sh" # Enable ipv6 on Travis. ref: a39c8b7ce30d -if ! test "${TRAVIS_OS_NAME}" = osx ; then +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 diff --git a/ci/common/build.sh b/ci/common/build.sh index f0bdec0a0e..0ee4b7493f 100644 --- a/ci/common/build.sh +++ b/ci/common/build.sh @@ -1,5 +1,5 @@ _stat() { - if test "${TRAVIS_OS_NAME}" = osx ; then + if test "${CI_OS_NAME}" = osx ; then stat -f %Sm "${@}" else stat -c %y "${@}" diff --git a/ci/common/test.sh b/ci/common/test.sh index 4ef6260339..118e181dfa 100644 --- a/ci/common/test.sh +++ b/ci/common/test.sh @@ -15,7 +15,7 @@ print_core() { return 0 fi echo "======= Core file $core =======" - if test "${TRAVIS_OS_NAME}" = osx ; then + if test "${CI_OS_NAME}" = osx ; then lldb -Q -o "bt all" -f "${app}" -c "${core}" else gdb -n -batch -ex 'thread apply all bt full' "${app}" -c "${core}" @@ -30,7 +30,7 @@ check_core_dumps() { fi local app="${1:-${BUILD_DIR}/bin/nvim}" local cores - if test "${TRAVIS_OS_NAME}" = osx ; then + if test "${CI_OS_NAME}" = osx ; then cores="$(find /cores/ -type f -print)" local _sudo='sudo' else |