Browse Source

Merge branch 'master' into nathalie/master

# Conflicts:
#	.gitlab-ci.yml
Nathalie Furmento 4 years ago
parent
commit
e6e9f89b9b
3 changed files with 1 additions and 5 deletions
  1. 0 4
      .gitlab-ci.yml
  2. 0 0
      contrib/ci.inria.fr/job-1-build-windows.sh
  3. 1 1
      tests/loader.c

+ 0 - 4
.gitlab-ci.yml

@@ -25,9 +25,6 @@ build:
   artifacts:
     paths:
       - starpu*.tar.gz
-      - starpu.pdf
-      - starpu_dev.pdf
-      - contrib/ci.inria.fr/job-1-check.sh
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push"'
       when: never  # Prevent pipeline run for push event
@@ -36,7 +33,6 @@ build:
 deploy:
   stage: deploy
   script:
-    - ls
     - ./contrib/gitlab/deploy.sh
   rules:
     - if: '$CI_PIPELINE_SOURCE == "push"'

+ 0 - 0
contrib/ci.inria.fr/job-1-build-windows.sh


+ 1 - 1
tests/loader.c

@@ -176,7 +176,7 @@ static void test_cleaner(int sig)
 	kill(-child_gid, SIGQUIT);
 	waitpid(child_pid, &status, 0);
 	launch_gdb(test_name);
-	raise(SIGQUIT);
+	raise(SIGALRM);
 	exit(EXIT_FAILURE);
 }