diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2018-03-13 13:19:02 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2018-03-13 13:19:02 +0000 |
| commit | 8c00b612e5a35905ca5caa23cec207bd55e011be (patch) | |
| tree | 56544b4bb3cae9d9f225f2802849ac983e53acd5 | |
| parent | 3de1462ed8a6e0820e2018aa67197c15f291ab16 (diff) | |
| download | strace-8c00b612e5a35905ca5caa23cec207bd55e011be.tar.gz | |
ci: rename travis-build.sh and travis-install.sh scripts
* travis-build.sh: Rename to ci/run-build-and-tests.sh, all callers
updated.
* travis-install.sh: Rename to ci/install-dependencies.sh, all callers
updated.
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh (renamed from travis-install.sh) | 0 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh (renamed from travis-build.sh) | 0 |
4 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dd2dcee1..4ac054a7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: "ubuntu:17.10" before_script: - - ./travis-install.sh + - ci/install-dependencies.sh variables: GIT_DEPTH: "2147483647" @@ -10,28 +10,28 @@ variables: gcc-x86_64: stage: test - script: ./travis-build.sh + script: ci/run-build-and-tests.sh variables: CC: "gcc" TARGET: "x86_64" gcc-x86: stage: test - script: ./travis-build.sh + script: ci/run-build-and-tests.sh variables: CC: "gcc" TARGET: "x86" clang-x86_64: stage: test - script: ./travis-build.sh + script: ci/run-build-and-tests.sh variables: CC: "clang" TARGET: "x86_64" clang-x86: stage: test - script: ./travis-build.sh + script: ci/run-build-and-tests.sh variables: CC: "clang" TARGET: "x86" diff --git a/.travis.yml b/.travis.yml index f5af69f51..42d897c92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: c dist: trusty -before_install: ./travis-install.sh +before_install: ci/install-dependencies.sh -script: ./travis-build.sh +script: ci/run-build-and-tests.sh sudo: required diff --git a/travis-install.sh b/ci/install-dependencies.sh index 2fbd275b4..2fbd275b4 100755 --- a/travis-install.sh +++ b/ci/install-dependencies.sh diff --git a/travis-build.sh b/ci/run-build-and-tests.sh index 55bd84040..55bd84040 100755 --- a/travis-build.sh +++ b/ci/run-build-and-tests.sh |