Merge branch 'ci' into 'master'

Revert "SHUT UP AND DO NOT BOTHER ME"

See merge request evol/evol-hercules!26

2 files changed, 5 insertions, 18 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0e2d57..2c2cca1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ stages:
   - build
   - test
   - legacy
-  - broken
 
 before_script:
   - uname -a
@@ -10,13 +9,13 @@ before_script:
 # simple builds
 
 gcc-snapshot:
-  stage: broken
+  stage: build
   script:
   - ./tools/ci/jobs/gccsnapshot.sh --enable-werror
   image: debian:unstable
 
 gcc-snapshot-i386:
-  stage: broken
+  stage: build
   script:
   - ./tools/ci/jobs/gccsnapshot.sh --enable-werror
   image: i386/debian:unstable
@@ -132,13 +131,13 @@ clang-8-i386:
 # tests
 
 gcc-snapshot_lto-sanitize:
-  stage: broken
+  stage: test
   script:
   - ./tools/ci/jobs/gccsnapshot.sh --enable-werror --enable-lto --enable-sanitize
   image: debian:unstable
 
 gcc-snapshot-sanitize:
-  stage: broken
+  stage: test
   script:
   - ./tools/ci/jobs/gccsnapshot.sh --enable-werror --enable-sanitize
   image: debian:unstable
diff --git a/tools/ci/jobs/gccsnapshot.sh b/tools/ci/jobs/gccsnapshot.sh
index 2709f38..5e49d3e 100755
--- a/tools/ci/jobs/gccsnapshot.sh
+++ b/tools/ci/jobs/gccsnapshot.sh
@@ -18,16 +18,4 @@ build_init
 # look like in gcc snapshot bug in this flag
 export CFLAGS="-Wno-restrict"
 run_configure $*
-
-# This build is broken, so I've commented below
-#run_make
-
-# And put this
-echo "make -j2 V=0 $*"
-make -j2 V=0 $*
-if [ "$1" != 0 ]; then
-    echo "error $1"
-    echo "=== THE ERROR HAS BEEN IGNORED ==="
-    echo "===== FIXME PLEASE ====="
-fi
-exit 0 # Success! (For GitLab, anyway)
+run_make