summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/ci/branches/ci_deheader/.gitlab-ci.yml134
-rw-r--r--tools/ci/branches/ci_gcc49/.gitlab-ci.yml12
2 files changed, 128 insertions, 18 deletions
diff --git a/tools/ci/branches/ci_deheader/.gitlab-ci.yml b/tools/ci/branches/ci_deheader/.gitlab-ci.yml
index 6360f10ac..38f1cebb3 100644
--- a/tools/ci/branches/ci_deheader/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_deheader/.gitlab-ci.yml
@@ -62,52 +62,52 @@ variables:
libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-deheader_libxml_opengl_tmwa:
+deheader_libxml_opengl_tmwa_cpp:
stage: build
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
-deheader_sdl2_libxml_opengl_tmwa:
+deheader_sdl2_libxml_opengl_tmwa_cpp:
stage: build
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
-deheader_libxml_tmwa:
+deheader_libxml_tmwa_cpp:
stage: build
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
-deheader_sdl2_libxml_tmwa:
+deheader_sdl2_libxml_tmwa_cpp:
stage: build
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
-deheader_tinyxml_opengl_tmwa:
+deheader_tinyxml_opengl_tmwa_cpp:
stage: build
script:
- - export FLAGS="-DENABLE_TINYXML2 -DUSE_TINYXML_OLD -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
+ - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
variables:
@@ -120,12 +120,12 @@ deheader_tinyxml_opengl_tmwa:
libtinyxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
-deheader_sdl2_tinyxml_opengl_tmwa:
+deheader_sdl2_tinyxml_opengl_tmwa_cpp:
stage: build
script:
- - export FLAGS="-DENABLE_TINYXML2 -DUSE_TINYXML_OLD -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
+ - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
- ./tools/ci/jobs/deheader.sh
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
variables:
@@ -138,24 +138,122 @@ deheader_sdl2_tinyxml_opengl_tmwa:
libtinyxml2-dev libxml2-dev libcurl4-gnutls-dev libpng-dev
libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
-deheader_libxml_opengl:
+deheader_libxml_opengl_cpp:
stage: build
script:
- export FLAGS="-DENABLE_LIBXML -DUSE_OPENGL -DUSE_X11"
- ./tools/ci/jobs/deheader.sh
- export skipPath="src/net/tmwa/"
- - find ./src -type f \( -name "*.cpp" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_shared
-deheader_sdl2_libxml_opengl:
+deheader_sdl2_libxml_opengl_cpp:
stage: build
script:
- 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" -o -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - find ./src -type f \( -name "*.cpp" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ <<: *job-deheader_sdl2_shared
+
+deheader_libxml_opengl_tmwa_h:
+ stage: build
+ 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/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ <<: *job-deheader_shared
+
+deheader_sdl2_libxml_opengl_tmwa_h:
+ stage: build
+ 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/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ <<: *job-deheader_sdl2_shared
+
+deheader_libxml_tmwa_h:
+ stage: build
+ script:
+ - export FLAGS="-DENABLE_LIBXML -DUSE_X11 -DTMWA_SUPPORT"
+ - ./tools/ci/jobs/deheader.sh
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ <<: *job-deheader_shared
+
+deheader_sdl2_libxml_tmwa_h:
+ stage: build
+ 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/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ <<: *job-deheader_sdl2_shared
+
+deheader_tinyxml_opengl_tmwa_h:
+ stage: build
+ script:
+ - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT"
+ - ./tools/ci/jobs/deheader.sh
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ variables:
+ GIT_DEPTH: "1"
+ INCLUDES: "-I/usr/include/SDL -I/usr/include/libxml2"
+ LOGFILE: logs/deheader.log
+ CXX: g++-5
+ PACKAGES: git python wget
+ gcc-5 g++-5
+ libtinyxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+
+deheader_sdl2_tinyxml_opengl_tmwa_h:
+ stage: build
+ script:
+ - export FLAGS="-DENABLE_TINYXML2 -DUSE_OPENGL -DUSE_X11 -DTMWA_SUPPORT -DUSE_SDL2"
+ - ./tools/ci/jobs/deheader.sh
+ - find ./src -type f \( -name "*.h" \) -exec tools/ci/scripts/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ variables:
+ GIT_DEPTH: "1"
+ INCLUDES: "-I/usr/include/SDL2 -I/usr/include/libxml2"
+ LOGFILE: logs/deheader.log
+ CXX: g++-5
+ PACKAGES: git python wget
+ gcc-5 g++-5
+ libtinyxml2-dev libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl2-gfx-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-net-dev libsdl2-ttf-dev
+
+deheader_libxml_opengl_h:
+ stage: build
+ script:
+ - 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/deheader.sh {} \;
+ - ./tools/ci/jobs/deheader2.sh
+ <<: *job-push
+ <<: *job-deheader_shared
+
+deheader_sdl2_libxml_opengl_h:
+ stage: build
+ script:
+ - 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/deheader.sh {} \;
- ./tools/ci/jobs/deheader2.sh
<<: *job-push
<<: *job-deheader_sdl2_shared
diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
index 4500caabd..214a19a63 100644
--- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml
@@ -147,6 +147,18 @@ gcc-4.9:
script:
- ./tools/ci/jobs/gcc49.sh
- ./tools/ci/scripts/runtests.sh
+ image: debian:jessie
+ <<: *job-push
+ variables:
+ PACKAGES: gcc-4.9 g++-4.9
+ make autoconf automake autopoint gettext
+ libxml2-dev libcurl4-gnutls-dev libpng-dev
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev
+ gdb valgrind netcat-openbsd procps git
+
+gcc-4.9_c++11:
+ stage: build
+ script:
- ./tools/ci/jobs/gcc49_c++11.sh
- ./tools/ci/scripts/runtests.sh
image: debian:jessie
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-28 18:10:14 +0000