From 1dc6d31db94c59f5fe241af8a60f6951f039ecbc Mon Sep 17 00:00:00 2001
From: Christian Manfred Wunder <cw631063@fh-muenster.de>
Date: Wed, 19 Feb 2020 12:04:37 +0100
Subject: [PATCH] Master
---
.docker.gitlab-ci.yml | 26 ++++++++++++++++++++++++++
.gitlab-ci.yml | 25 +++++--------------------
result-2 | 1 +
3 files changed, 32 insertions(+), 20 deletions(-)
create mode 100644 .docker.gitlab-ci.yml
create mode 120000 result-2
diff --git a/.docker.gitlab-ci.yml b/.docker.gitlab-ci.yml
new file mode 100644
index 0000000..1f7407f
--- /dev/null
+++ b/.docker.gitlab-ci.yml
@@ -0,0 +1,26 @@
+image: "alpine:latest"
+
+before_script:
+ - apk update && apk add make && apk add g++ && apk add afl && apk add afl-gcc && apk add catch2 && apk add bash
+
+test:
+ stage: test
+ script:
+ - make run_test
+
+fuzz:
+ stage: test
+ script:
+ - make fuzz_calc
+ - ./fuzz_seconds.sh
+ artifacts:
+ paths:
+ - out
+
+build:
+ stage: build
+ script:
+ - make
+ artifacts:
+ paths:
+ - calc
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f7407f..29c5ca0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,11 @@
-image: "alpine:latest"
-
-before_script:
- - apk update && apk add make && apk add g++ && apk add afl && apk add afl-gcc && apk add catch2 && apk add bash
-
-test:
- stage: test
- script:
- - make run_test
-
-fuzz:
- stage: test
- script:
- - make fuzz_calc
- - ./fuzz_seconds.sh
- artifacts:
- paths:
- - out
+image: "nixos/nix:latest"
build:
stage: build
script:
- - make
+ - nix-build
+ - mkdir myresult
+ - cp -Lr result* myresult/
artifacts:
paths:
- - calc
\ No newline at end of file
+ - myresult
\ No newline at end of file
diff --git a/result-2 b/result-2
new file mode 120000
index 0000000..87e8b10
--- /dev/null
+++ b/result-2
@@ -0,0 +1 @@
+/nix/store/i34gj1plbby45yvnplq63x39ydryvnai-test
\ No newline at end of file
--
GitLab