summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Möller <nisse@lysator.liu.se>2020-01-26 14:37:45 +0100
committerNiels Möller <nisse@lysator.liu.se>2020-01-26 14:37:45 +0100
commita2757e4308bd4b28c6bdf4a7da8b89e8463debd8 (patch)
treefe40873c6acfd99248fd09f987602faa701c5eb5
parent5694b1e418f82869e67eb06ba6c4784c0755df5b (diff)
parent33d047b2fdf56207fa26a41c531eb7b3192ced53 (diff)
downloadnettle-a2757e4308bd4b28c6bdf4a7da8b89e8463debd8.tar.gz
Merge branch 'master' into delete-ecc-g
For gitlab CI fix.
-rw-r--r--.gitlab-ci.yml10
1 files changed, 10 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85acdf14..663f98f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@ build/x86-64:
make check -j4
tags:
- shared
+ - linux
except:
- tags
build/mini-gmp:
@@ -28,6 +29,7 @@ build/mini-gmp:
make check -j4
tags:
- shared
+ - linux
except:
- tags
build/c89:
@@ -38,6 +40,7 @@ build/c89:
make check -j4
tags:
- shared
+ - linux
except:
- tags
build/ndebug:
@@ -48,6 +51,7 @@ build/ndebug:
make check -j4
tags:
- shared
+ - linux
except:
- tags
build/ubsan:
@@ -58,6 +62,7 @@ build/ubsan:
--disable-documentation && make -j4 && make check -j4
tags:
- shared
+ - linux
except:
- tags
build/asan:
@@ -68,6 +73,7 @@ build/asan:
make -j4 && make check -j4
tags:
- shared
+ - linux
except:
- tags
build/static-analyzers:
@@ -78,6 +84,7 @@ build/static-analyzers:
- scan-build --status-bugs -o scan-build-lib make -j$(nproc)
tags:
- shared
+ - linux
except:
- tags
artifacts:
@@ -97,6 +104,7 @@ build/gnutls:
make -j $(nproc) check
tags:
- shared
+ - linux
except:
- tags
artifacts:
@@ -122,6 +130,7 @@ Debian.cross.x86:
make check -j4
tags:
- shared
+ - linux
except:
- tags
.Debian.cross.template: &Debian_cross_template
@@ -143,6 +152,7 @@ Debian.cross.x86:
- make -j$(nproc) check
tags:
- shared
+ - linux
except:
- tags
Debian.cross.arm-linux-gnueabihf: