ci (almost done2)

JuliaPerf · May 23, 2022 · 2fb62c0 · 2fb62c0
1 parent 85c9517
commit 2fb62c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.gitlab-ci-N2.yml b/.gitlab-ci-N2.yml
@@ -10,11 +10,12 @@ julia/1.7-N2:
     SCHEDULER_PARAMETERS: "-N 1 -n 1 -c 128 -t 00:15:00 -A pc2-mitarbeiter -p fpga --exclusive"
     JULIA_NUM_THREADS: "12"
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    # - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
-      when: manual
     - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
+    - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "external_pull_request_event"'
+      when: never
     - if: '$CI_COMMIT_BRANCH' # trigger on commits
     - when: never # don't run otherwise
     # - if: '$CI_PIPELINE_SOURCE == "push"' # trigger on pushs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -12,11 +12,12 @@ build-likwid:
     - testcluster
   rules:
     - if: '$CI_COMMIT_TAG' # trigger on tags
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    # - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
-      when: manual
     - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "merge_request_event"'
       when: never
+    - if: '$CI_COMMIT_BRANCH && $CI_PIPELINE_SOURCE == "external_pull_request_event"'
+      when: never
     - if: '$CI_COMMIT_BRANCH' # trigger on commits
     - when: never # don't run otherwise
   variables: