nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Some more small improvements on gitlab-ci
[nit.git]
/
.gitlab-ci.yml
diff --git
a/.gitlab-ci.yml
b/.gitlab-ci.yml
index
696b258
..
70b91e1
100644
(file)
--- a/
.gitlab-ci.yml
+++ b/
.gitlab-ci.yml
@@
-51,7
+51,7
@@
sanity_checks:
- misc/jenkins/checksignedoffby.sh | tee -a status.txt
- misc/jenkins/checklicense.sh | tee -a status.txt
- misc/jenkins/checksignedoffby.sh | tee -a status.txt
- misc/jenkins/checklicense.sh | tee -a status.txt
-build_tools:
+build_tools: &build_tools
stage: build
script:
- make 2>> status.txt
stage: build
script:
- make 2>> status.txt
@@
-65,7
+65,7
@@
build_tools:
- src/nitc_0
when: always
- src/nitc_0
when: always
-test_some:
+test_some: &test_some
stage: test
dependencies:
- build_tools
stage: test
dependencies:
- build_tools
@@
-120,11
+120,12
@@
basic_android:
# TEST FULL #########################################################
# TEST FULL #########################################################
-test_full_nitcs:
+test_full_nitcs: &test_full_nitcs
stage: more_test
dependencies:
- build_tools
script:
stage: more_test
dependencies:
- build_tools
script:
+ - share/android-bdwgc/setup.sh
- cd tests
- ./testfull.sh | tee log.txt
- grep -v '=>' log.txt > ../status.txt || true
- cd tests
- ./testfull.sh | tee log.txt
- grep -v '=>' log.txt > ../status.txt || true
@@
-384,11
+385,21
@@
build_catalog:
paths:
- catalog.out
paths:
- catalog.out
-.test_macos:
- script:
- - uname
- - pwd
- - ls /
- stage: build
+build_tools_macos:
+ <<: *build_tools
+ tags:
+ - macos
+
+test_some_macos:
+ <<: *test_some
tags:
- macos
tags:
- macos
+ dependencies:
+ - build_tools_macos
+
+test_full_nitcs_macos:
+ <<: *test_full_nitcs
+ tags:
+ - macos
+ dependencies:
+ - build_tools_macos