From a1c928e70cd995426449ac6ec6df3b5a492580e5 Mon Sep 17 00:00:00 2001 From: Nikolai Aleksandrovich Pavlov Date: Fri, 31 Mar 2017 15:32:58 +0300 Subject: [PATCH] ci: Do not hide ci directory (#6410) --- .travis.yml | 12 ++++++------ README.md | 2 +- appveyor.yml | 4 ++-- {.ci => ci}/after_success.sh | 0 {.ci => ci}/before_cache.sh | 0 {.ci => ci}/before_install.sh | 0 {.ci => ci}/before_script.sh | 0 {.ci => ci}/build.bat | 0 {.ci => ci}/common/build.sh | 0 {.ci => ci}/common/test.sh | 0 {.ci => ci}/install.sh | 0 {.ci => ci}/run_tests.sh | 0 {.ci => ci}/script.sh | 4 ++-- test/unit/helpers.lua | 2 +- 14 files changed, 12 insertions(+), 12 deletions(-) rename {.ci => ci}/after_success.sh (100%) rename {.ci => ci}/before_cache.sh (100%) rename {.ci => ci}/before_install.sh (100%) rename {.ci => ci}/before_script.sh (100%) rename {.ci => ci}/build.bat (100%) rename {.ci => ci}/common/build.sh (100%) rename {.ci => ci}/common/test.sh (100%) rename {.ci => ci}/install.sh (100%) rename {.ci => ci}/run_tests.sh (100%) rename {.ci => ci}/script.sh (84%) diff --git a/.travis.yml b/.travis.yml index d28fc9d7f1..a02d44ea47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,12 +83,12 @@ matrix: - env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON" fast_finish: true -before_install: .ci/before_install.sh -install: .ci/install.sh -before_script: .ci/before_script.sh -script: .ci/script.sh -before_cache: .ci/before_cache.sh -after_success: .ci/after_success.sh +before_install: ci/before_install.sh +install: ci/install.sh +before_script: ci/before_script.sh +script: ci/script.sh +before_cache: ci/before_cache.sh +after_success: ci/after_success.sh addons: apt: diff --git a/README.md b/README.md index dcead08331..bfa0216a0f 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Packages are in [Homebrew], [Debian], [Ubuntu], [Fedora], [Arch Linux], and Project layout -------------- -- `.ci/`: Build server scripts +- `ci/`: Build server scripts - `cmake/`: Build scripts - `runtime/`: Application files - [`src/`](src/nvim/README.md): Application source code diff --git a/appveyor.yml b/appveyor.yml index ed5e06e3ee..091e86583a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,9 @@ configuration: - MINGW_32 install: [] build_script: -- call .ci\build.bat +- call ci\build.bat cache: -- C:\msys64\var\cache\pacman\pkg -> .ci\build.bat +- C:\msys64\var\cache\pacman\pkg -> ci\build.bat - .deps -> third-party/CMakeLists.txt artifacts: - path: build/Neovim.zip diff --git a/.ci/after_success.sh b/ci/after_success.sh similarity index 100% rename from .ci/after_success.sh rename to ci/after_success.sh diff --git a/.ci/before_cache.sh b/ci/before_cache.sh similarity index 100% rename from .ci/before_cache.sh rename to ci/before_cache.sh diff --git a/.ci/before_install.sh b/ci/before_install.sh similarity index 100% rename from .ci/before_install.sh rename to ci/before_install.sh diff --git a/.ci/before_script.sh b/ci/before_script.sh similarity index 100% rename from .ci/before_script.sh rename to ci/before_script.sh diff --git a/.ci/build.bat b/ci/build.bat similarity index 100% rename from .ci/build.bat rename to ci/build.bat diff --git a/.ci/common/build.sh b/ci/common/build.sh similarity index 100% rename from .ci/common/build.sh rename to ci/common/build.sh diff --git a/.ci/common/test.sh b/ci/common/test.sh similarity index 100% rename from .ci/common/test.sh rename to ci/common/test.sh diff --git a/.ci/install.sh b/ci/install.sh similarity index 100% rename from .ci/install.sh rename to ci/install.sh diff --git a/.ci/run_tests.sh b/ci/run_tests.sh similarity index 100% rename from .ci/run_tests.sh rename to ci/run_tests.sh diff --git a/.ci/script.sh b/ci/script.sh similarity index 84% rename from .ci/script.sh rename to ci/script.sh index 46c4eecf38..79a1bec201 100755 --- a/.ci/script.sh +++ b/ci/script.sh @@ -12,7 +12,7 @@ fi # 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_tests.sh" + sudo -E su "${USER}" -c "ci/run_tests.sh" else - .ci/run_tests.sh + ci/run_tests.sh fi diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua index 8aad3acd98..f4e6194fc7 100644 --- a/test/unit/helpers.lua +++ b/test/unit/helpers.lua @@ -574,7 +574,7 @@ local function gen_itp(it) if not err then if allow_failure then io.stderr:write('Errorred out:\n' .. tostring(emsg) .. '\n') - os.execute([[sh -c "source .ci/common/test.sh ; check_core_dumps --delete \"]] .. Paths.test_luajit_prg .. [[\""]]) + os.execute([[sh -c "source ci/common/test.sh ; check_core_dumps --delete \"]] .. Paths.test_luajit_prg .. [[\""]]) else error(emsg) end