.gitlab-ci.yml

@@ -32,7 +32,7 @@ workflow:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v\d+.\d+.\d+/
     - if: $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule"
       when: on_success
     - if: $CI_COMMIT_BRANCH != "master" && $CI_OPEN_MERGE_REQUESTS
       when: never
@@ -42,20 +42,23 @@ workflow:
 reuse:
   interruptible: true
   stage: analyse
-  image: gitlab-registry.cern.ch/be-cem-edl/diot/docker-util/gitlab_release
-  tags:
-    - vivado-template
+  image:
+    name: fsfe/reuse:latest
+    entrypoint: [""]
+  rules:
+    - !reference [.default_rules, rules]
+    - if: $CI_COMMIT_BRANCH != "master"
   script:
-    - echo "Nothing to do here"
+    - reuse lint
 
 ################################################################################
 # Build job
 .build_job:
   interruptible: true
   stage: build
-  image: gitlab-registry.cern.ch/cce/docker_build/libero-cc7
+  image: registry.cern.ch/ci4fpga/libero:11.9
   tags:
-    - vivado-template
+    - fpga-mid
   rules:
     - !reference [.default_rules, rules]
     - if: $CI_COMMIT_BRANCH != "master"
@@ -69,7 +72,7 @@ reuse:
           - 'top/nanofip.vhd'
           - 'top/Manifest.py'
   artifacts:
-    name: 'FMC-NANOFIP-${CI_COMMIT_BRANCH}'
+    name: 'FMC-NANOFIP-${CI_COMMIT_REF_NAME}'
     paths:
       - artifacts
 
@@ -94,7 +97,7 @@ doc_build:
     EDL_CI_DOC_DST_PATH: ${EDL_CI_EOS_OUTPUT_DIR}/doc
   rules:
     - !reference [.default_rules, rules]
-    - if: $CI_COMMIT_REF_NAME =~ /^\d+-/
+    - if: $CI_COMMIT_BRANCH != "master"
       changes:
         compare_to: 'refs/heads/master'
         paths: