summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <git@gumi.ca>2020-07-15 20:46:14 -0400
committergumi <git@gumi.ca>2020-07-15 20:46:22 -0400
commita6e40c184f9f64717eda38178310ec5328f5251b (patch)
treee75260c237cb494d7c889c5237d3a5b08a153cd2
parent3a886cf674fbaf971620538ae2365b317db1a257 (diff)
downloadevol-hercules-a6e40c184f9f64717eda38178310ec5328f5251b.tar.gz
evol-hercules-a6e40c184f9f64717eda38178310ec5328f5251b.tar.bz2
evol-hercules-a6e40c184f9f64717eda38178310ec5328f5251b.tar.xz
evol-hercules-a6e40c184f9f64717eda38178310ec5328f5251b.zip
Revert "SHUT UP AND DO NOT BOTHER ME"
This reverts commit 19d651f235973dc6bbab9489aeda6da39adad86b.
-rw-r--r--.gitlab-ci.yml9
-rwxr-xr-xtools/ci/jobs/gccsnapshot.sh14
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