diff options
| author | gumi <git@gumi.ca> | 2020-07-16 13:13:24 +0000 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2020-07-16 13:13:24 +0000 |
| commit | 4cf52a75e983abd5bda18da87fe1498e382fef23 (patch) | |
| tree | e75260c237cb494d7c889c5237d3a5b08a153cd2 | |
| parent | 3a886cf674fbaf971620538ae2365b317db1a257 (diff) | |
| parent | a6e40c184f9f64717eda38178310ec5328f5251b (diff) | |
| download | plugin-4cf52a75e983abd5bda18da87fe1498e382fef23.tar.gz plugin-4cf52a75e983abd5bda18da87fe1498e382fef23.tar.bz2 plugin-4cf52a75e983abd5bda18da87fe1498e382fef23.tar.xz plugin-4cf52a75e983abd5bda18da87fe1498e382fef23.zip | |
Merge branch 'ci' into 'master'
Revert "SHUT UP AND DO NOT BOTHER ME"
See merge request evol/evol-hercules!26
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rwxr-xr-x | tools/ci/jobs/gccsnapshot.sh | 14 |
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 |