Browse Source

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.
Dmitry V. Levin 2 years ago
parent
commit
8c00b612e5
4 changed files with 7 additions and 7 deletions
  1. 5
    5
      .gitlab-ci.yml
  2. 2
    2
      .travis.yml
  3. 0
    0
      ci/install-dependencies.sh
  4. 0
    0
      ci/run-build-and-tests.sh

+ 5
- 5
.gitlab-ci.yml View File

@@ -1,7 +1,7 @@
1 1
 image: "ubuntu:17.10"
2 2
 
3 3
 before_script:
4
-  - ./travis-install.sh
4
+  - ci/install-dependencies.sh
5 5
 
6 6
 variables:
7 7
   GIT_DEPTH: "2147483647"
@@ -10,28 +10,28 @@ variables:
10 10
 
11 11
 gcc-x86_64:
12 12
   stage: test
13
-  script: ./travis-build.sh
13
+  script: ci/run-build-and-tests.sh
14 14
   variables:
15 15
     CC: "gcc"
16 16
     TARGET: "x86_64"
17 17
 
18 18
 gcc-x86:
19 19
   stage: test
20
-  script: ./travis-build.sh
20
+  script: ci/run-build-and-tests.sh
21 21
   variables:
22 22
     CC: "gcc"
23 23
     TARGET: "x86"
24 24
 
25 25
 clang-x86_64:
26 26
   stage: test
27
-  script: ./travis-build.sh
27
+  script: ci/run-build-and-tests.sh
28 28
   variables:
29 29
     CC: "clang"
30 30
     TARGET: "x86_64"
31 31
 
32 32
 clang-x86:
33 33
   stage: test
34
-  script: ./travis-build.sh
34
+  script: ci/run-build-and-tests.sh
35 35
   variables:
36 36
     CC: "clang"
37 37
     TARGET: "x86"

+ 2
- 2
.travis.yml View File

@@ -2,9 +2,9 @@ language: c
2 2
 
3 3
 dist: trusty
4 4
 
5
-before_install: ./travis-install.sh
5
+before_install: ci/install-dependencies.sh
6 6
 
7
-script: ./travis-build.sh
7
+script: ci/run-build-and-tests.sh
8 8
 
9 9
 sudo: required
10 10
 

travis-install.sh → ci/install-dependencies.sh View File


travis-build.sh → ci/run-build-and-tests.sh View File


Loading…
Cancel
Save