summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-06-15 19:51:33 +0300
committerAndrei Karas <akaras@inbox.ru>2018-06-15 19:51:33 +0300
commitaa268232327833cb137285091b0c8d490ccdaa4e (patch)
treeb971e257539a144efdcc52a0e0c1be8e2ebe5f76 /tools
parent71bb37674ee76394b46f5aa5c710c128cb6dc14f (diff)
downloadplus-aa268232327833cb137285091b0c8d490ccdaa4e.tar.gz
plus-aa268232327833cb137285091b0c8d490ccdaa4e.tar.bz2
plus-aa268232327833cb137285091b0c8d490ccdaa4e.tar.xz
plus-aa268232327833cb137285091b0c8d490ccdaa4e.zip
Fix ci_deheader .gitlab-ci.yml again. [ci skip]
Diffstat (limited to 'tools')
-rw-r--r--tools/ci/branches/ci_deheader/.gitlab-ci.yml28
1 files changed, 16 insertions, 12 deletions
diff --git a/tools/ci/branches/ci_deheader/.gitlab-ci.yml b/tools/ci/branches/ci_deheader/.gitlab-ci.yml
index 591e1e6fd..e0dd9b489 100644
--- a/tools/ci/branches/ci_deheader/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_deheader/.gitlab-ci.yml
@@ -43,7 +43,7 @@ deheader_libxml_opengl_tmwa_cpp:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
@@ -53,7 +53,7 @@ deheader_sdl2_libxml_opengl_tmwa_cpp:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
@@ -63,7 +63,7 @@ deheader_libxml_tmwa_cpp:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
@@ -73,7 +73,7 @@ deheader_sdl2_libxml_tmwa_cpp:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
@@ -86,6 +86,7 @@ deheader_tinyxml_opengl_tmwa_cpp:
- find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
+ image: debian:unstable
variables:
GIT_DEPTH: "1"
INCLUDES: "-I/usr/include/SDL -I/usr/include/libxml2"
@@ -104,6 +105,7 @@ deheader_sdl2_tinyxml_opengl_tmwa_cpp:
- find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
+ image: debian:unstable
variables:
GIT_DEPTH: "1"
INCLUDES: "-I/usr/include/SDL2 -I/usr/include/libxml2"
@@ -120,7 +122,7 @@ deheader_libxml_opengl_cpp:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11"
- ./tools/ci/jobs/deheader.sh
- export skipPath="src/net/tmwa/"
- - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
@@ -131,7 +133,7 @@ deheader_sdl2_libxml_opengl_cpp:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- export skipPath="src/net/tmwa/"
- - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
@@ -141,7 +143,7 @@ deheader_libxml_opengl_tmwa_h:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
@@ -151,7 +153,7 @@ deheader_sdl2_libxml_opengl_tmwa_h:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
@@ -161,7 +163,7 @@ deheader_libxml_tmwa_h:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
@@ -171,7 +173,7 @@ deheader_sdl2_libxml_tmwa_h:
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
@@ -184,6 +186,7 @@ deheader_tinyxml_opengl_tmwa_h:
- find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
+ image: debian:unstable
variables:
GIT_DEPTH: "1"
INCLUDES: "-I/usr/include/SDL -I/usr/include/libxml2"
@@ -202,6 +205,7 @@ deheader_sdl2_tinyxml_opengl_tmwa_h:
- find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
+ image: debian:unstable
variables:
GIT_DEPTH: "1"
INCLUDES: "-I/usr/include/SDL2 -I/usr/include/libxml2"
@@ -218,7 +222,7 @@ deheader_libxml_opengl_h:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11"
- ./tools/ci/jobs/deheader.sh
- export skipPath="src/net/tmwa/"
- - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
@@ -229,7 +233,7 @@ deheader_sdl2_libxml_opengl_h:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- export skipPath="src/net/tmwa/"
- - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheaderS.sh {} \;
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared